Thread: [Jsmooth-cvs] jsmooth/skeletons/util-core md5.h, NONE, 1.1 RegistryKey.cpp, NONE, 1.1 RegistryKey.h
Status: Beta
Brought to you by:
reyes
From: Rodrigo R. <re...@us...> - 2007-05-27 09:14:57
|
Update of /cvsroot/jsmooth/jsmooth/skeletons/util-core In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14482/skeletons/util-core Modified Files: Thread.cpp Thread.h Process.cpp Makefile.win Process.h SingleInstanceManager.cpp testmain.cpp Added Files: md5.h RegistryKey.cpp RegistryKey.h md5.c Log Message: splash screen support and small overall refactoring Index: SingleInstanceManager.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/SingleInstanceManager.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SingleInstanceManager.cpp 18 May 2007 21:34:00 -0000 1.2 --- SingleInstanceManager.cpp 27 May 2007 09:14:52 -0000 1.3 *************** *** 1,177 **** ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include "SingleInstanceManager.h" ! ! #include <windows.h> ! #include <winbase.h> ! ! void pipe_wait_callback(void* param) ! { ! SingleInstanceManager* sim = (SingleInstanceManager*)param; ! while (true) ! { ! std::string msg = sim->waitPipeMessage(); ! printf("Got MESSAGE: %s\n", msg.c_str()); ! sim->processMessage(msg); ! fflush(stdout); ! } ! } ! ! ! SingleInstanceManager::SingleInstanceManager() ! { ! std::string name = "{"+FileUtils::getExecutablePath() + "::" + FileUtils::getExecutableFileName() + "}"; ! name = StringUtils::replace(name, "\\", ":"); ! init(name); ! } ! ! SingleInstanceManager::SingleInstanceManager(const std::string& uniqueName) ! { ! init(uniqueName); ! } ! ! SingleInstanceManager::~SingleInstanceManager() ! { ! if (m_mutex != NULL) ! CloseHandle(m_mutex); ! } ! ! void SingleInstanceManager::init(const std::string& uniqname) ! { ! m_name = uniqname; ! m_mutex = CreateMutex(NULL, FALSE, uniqname.c_str()); //do early ! m_lasterror = GetLastError(); //save for use later... ! m_alreadyexists = (m_lasterror == ERROR_ALREADY_EXISTS)?true:false; ! } ! ! void SingleInstanceManager::startMasterInstanceServer() ! { ! if (!m_alreadyexists) ! { ! m_pipethread.start(pipe_wait_callback, this); ! } ! } ! ! void SingleInstanceManager::sendMessageInstanceShow() ! { ! char *message = "SHOWWINDOW PLZ"; ! DWORD msglen = strlen(message); ! char bufferout[256]; ! DWORD lenout = 255, readlen=0; ! ! CallNamedPipe(getPipeName().c_str(), ! message, msglen, ! bufferout, lenout, ! &readlen, ! 2); ! ! } ! ! bool SingleInstanceManager::alreadyExists() ! { ! return m_alreadyexists; ! } ! ! std::string SingleInstanceManager::waitPipeMessage() ! { ! std::string result = ""; ! ! std::string pipename = getPipeName(); ! ! m_pipe = CreateNamedPipe(pipename.c_str(), ! PIPE_ACCESS_DUPLEX, ! PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, ! 6, ! 256, ! 256, ! NMPWAIT_USE_DEFAULT_WAIT, ! NULL); ! ! if (m_pipe == INVALID_HANDLE_VALUE) ! { ! m_pipe = NULL; ! return ""; ! } ! ! if (ConnectNamedPipe(m_pipe, NULL)) ! { ! printf("waitPipeMessage...\n"); ! fflush(stdout); ! ! printf("connected to named pipe...\n"); ! fflush(stdout); ! char buffer[256]; ! DWORD length; ! ! bool res = ReadFile(m_pipe, buffer, sizeof(buffer), &length, NULL); ! buffer[length] = 0; ! printf("read file %s\n", buffer); ! fflush(stdout); ! ! if (res && (length>0)) ! { ! bool res = WriteFile(m_pipe, buffer, strlen(buffer), &length, NULL); ! result = buffer; ! } ! ! DisconnectNamedPipe(m_pipe); ! } ! ! CloseHandle(m_pipe); ! ! return result; ! } ! ! BOOL CALLBACK displayWindowForProcess(HWND hwnd, LPARAM lParam ) ! { ! DWORD myprocessid = GetCurrentProcessId(); ! DWORD hid; ! GetWindowThreadProcessId(hwnd, &hid); ! printf("Checking %d, %d, %d\n", hwnd, hid, myprocessid); fflush(stdout); ! if (hid == myprocessid) ! { ! LONG style = GetWindowLong(hwnd, GWL_STYLE); ! if ((style & (WS_VISIBLE)) != 0) ! { ! SetForegroundWindow(hwnd); ! return false; ! } ! } ! return true; ! } ! ! void SingleInstanceManager::processMessage(const std::string& msg) ! { ! printf("PROCESSING MESSAGE\n"); ! fflush(stdout); ! EnumWindows(displayWindowForProcess, 0); ! } ! ! std::string SingleInstanceManager::getPipeName() ! { ! std::string pipename = "\\\\.\\pipe\\"; ! if (m_name.length() > (255-9)) ! pipename += m_name.substr( m_name.length() - (255-9) ); ! else ! pipename += m_name; ! ! return pipename; ! } --- 1,166 ---- ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include "SingleInstanceManager.h" ! ! #include <windows.h> ! #include <winbase.h> ! ! ! void pipe_wait_callback(void* param) ! { ! SingleInstanceManager* sim = (SingleInstanceManager*)param; ! while (true) ! { ! std::string msg = sim->waitPipeMessage(); ! sim->processMessage(msg); ! } ! } ! ! SingleInstanceManager::SingleInstanceManager() ! { ! std::string name = "{"+FileUtils::getExecutablePath() + "::" + FileUtils::getExecutableFileName() + "}"; ! name = StringUtils::replace(name, "\\", ":"); ! init(name); ! } ! ! SingleInstanceManager::SingleInstanceManager(const std::string& uniqueName) ! { ! init(uniqueName); ! } ! ! SingleInstanceManager::~SingleInstanceManager() ! { ! if (m_mutex != NULL) ! CloseHandle(m_mutex); ! } ! ! void SingleInstanceManager::init(const std::string& uniqname) ! { ! m_name = uniqname; ! m_mutex = CreateMutex(NULL, FALSE, uniqname.c_str()); //do early ! m_lasterror = GetLastError(); //save for use later... ! m_alreadyexists = (m_lasterror == ERROR_ALREADY_EXISTS)?true:false; ! } ! ! void SingleInstanceManager::startMasterInstanceServer() ! { ! if (!m_alreadyexists) ! { ! m_pipethread.start(pipe_wait_callback, this); ! } ! } ! ! void SingleInstanceManager::sendMessageInstanceShow() ! { ! char *message = "SHOWWINDOW PLZ"; ! DWORD msglen = strlen(message); ! char bufferout[256]; ! DWORD lenout = 255, readlen=0; ! ! CallNamedPipe(getPipeName().c_str(), ! message, msglen, ! bufferout, lenout, ! &readlen, ! 2); ! ! } ! ! bool SingleInstanceManager::alreadyExists() ! { ! return m_alreadyexists; ! } ! ! std::string SingleInstanceManager::waitPipeMessage() ! { ! std::string result = ""; ! ! std::string pipename = getPipeName(); ! ! m_pipe = CreateNamedPipe(pipename.c_str(), ! PIPE_ACCESS_DUPLEX, ! PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, ! 6, ! 256, ! 256, ! NMPWAIT_USE_DEFAULT_WAIT, ! NULL); ! ! if (m_pipe == INVALID_HANDLE_VALUE) ! { ! m_pipe = NULL; ! return ""; ! } ! ! if (ConnectNamedPipe(m_pipe, NULL)) ! { ! char buffer[256]; ! DWORD length; ! ! bool res = ReadFile(m_pipe, buffer, sizeof(buffer), &length, NULL); ! buffer[length] = 0; ! ! if (res && (length>0)) ! { ! bool res = WriteFile(m_pipe, buffer, strlen(buffer), &length, NULL); ! result = buffer; ! } ! ! DisconnectNamedPipe(m_pipe); ! } ! ! CloseHandle(m_pipe); ! ! return result; ! } ! ! BOOL CALLBACK displayWindowForProcess(HWND hwnd, LPARAM lParam ) ! { ! DWORD myprocessid = GetCurrentProcessId(); ! DWORD hid; ! GetWindowThreadProcessId(hwnd, &hid); ! ! if (hid == myprocessid) ! { ! LONG style = GetWindowLong(hwnd, GWL_STYLE); ! if ((style & (WS_VISIBLE)) != 0) ! { ! SetForegroundWindow(hwnd); ! return false; ! } ! } ! return true; ! } ! ! void SingleInstanceManager::processMessage(const std::string& msg) ! { ! EnumWindows(displayWindowForProcess, 0); ! } ! ! std::string SingleInstanceManager::getPipeName() ! { ! std::string pipename = "\\\\.\\pipe\\"; ! if (m_name.length() > (255-9)) ! pipename += m_name.substr( m_name.length() - (255-9) ); ! else ! pipename += m_name; ! ! return pipename; ! } --- NEW FILE: md5.h --- /* Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. L. Peter Deutsch gh...@al... */ /* $Id: md5.h,v 1.1 2007/05/27 09:14:51 reyes Exp $ */ /* Independent implementation of MD5 (RFC 1321). This code implements the MD5 Algorithm defined in RFC 1321, whose text is available at http://www.ietf.org/rfc/rfc1321.txt The code is derived from the text of the RFC, including the test suite (section A.5) but excluding the rest of Appendix A. It does not include any code or documentation that is identified in the RFC as being copyrighted. The original and principal author of md5.h is L. Peter Deutsch <gh...@al...>. Other authors are noted in the change history that follows (in reverse chronological order): 2002-04-13 lpd Removed support for non-ANSI compilers; removed references to Ghostscript; clarified derivation from RFC 1321; now handles byte order either statically or dynamically. 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); added conditionalization for C++ compilation from Martin Purschke <pur...@bn...>. 1999-05-03 lpd Original version. */ #ifndef md5_INCLUDED # define md5_INCLUDED /* * This package supports both compile-time and run-time determination of CPU * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is * defined as non-zero, the code will be compiled to run only on big-endian * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to * run on either big- or little-endian CPUs, but will run slightly less * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. */ typedef unsigned char md5_byte_t; /* 8-bit byte */ typedef unsigned int md5_word_t; /* 32-bit word */ /* Define the state of the MD5 Algorithm. */ typedef struct md5_state_s { md5_word_t count[2]; /* message length in bits, lsw first */ md5_word_t abcd[4]; /* digest buffer */ md5_byte_t buf[64]; /* accumulate block */ } md5_state_t; #ifdef __cplusplus extern "C" { #endif /* Initialize the algorithm. */ void md5_init(md5_state_t *pms); /* Append a string to the message. */ void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); /* Finish the message and return the digest. */ void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); #ifdef __cplusplus } /* end extern "C" */ #endif #endif /* md5_INCLUDED */ --- NEW FILE: RegistryKey.cpp --- /* JSmooth: a VM wrapper toolkit for Windows Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "RegistryKey.h" #include "StringUtils.h" RegistryKey::RegistryKey(KEYBASE parent, const std::string& subkey) { switch(parent) { case CURRENT_USER: init(HKEY_CURRENT_USER, subkey); break; case LOCAL_MACHINE: init(HKEY_LOCAL_MACHINE, subkey); break; case USERS: init(HKEY_USERS, subkey); break; } } RegistryKey::RegistryKey(const RegistryKey& parent, const std::string& subkey) { init(parent.m_key, subkey); } RegistryKey::~RegistryKey() { if (m_key != 0) RegCloseKey(m_key); } void RegistryKey::init(HKEY key, const std::string& subkey) { DWORD lpdwDisposition; if (RegCreateKeyEx(key, subkey.c_str(), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &m_key, &lpdwDisposition) != ERROR_SUCCESS) m_key = 0; } void RegistryKey::set(const std::string& name, const std::string& value) { if (m_key != 0) RegSetValueEx(m_key, name.c_str(), 0, REG_SZ, (const BYTE*) value.c_str(), value.size()+1); } void RegistryKey::set(const std::string& name, DWORD value) { if (m_key != 0) RegSetValueEx(m_key, name.c_str(), 0, REG_DWORD, (const BYTE*)&value, 4); } std::string RegistryKey::getString(const std::string& name) { DWORD lpType, size = 1024; byte buffer[1024]; byte*data = buffer; LONG res = RegQueryValueEx(m_key, name.c_str(), NULL, &lpType, data, &size); if (res == ERROR_SUCCESS) { switch(lpType) { case REG_DWORD: return StringUtils::toString(* ( (int*)data )); break; case REG_SZ: buffer[size] = 0; return std::string((char*)data); } } return ""; } DWORD RegistryKey::getInt(const std::string& name) { DWORD lpType, size = 1024; byte buffer[1024]; byte*data = buffer; LONG res = RegQueryValueEx(m_key, name.c_str(), NULL, &lpType, data, &size); if (res == ERROR_SUCCESS) { switch(lpType) { case REG_DWORD: return * ( (int*)data ); break; case REG_SZ: buffer[size] = 0; return StringUtils::parseInt((char*)data); } } return 0; } --- NEW FILE: md5.c --- /* Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. L. Peter Deutsch gh...@al... */ /* $Id: md5.c,v 1.1 2007/05/27 09:14:52 reyes Exp $ */ /* Independent implementation of MD5 (RFC 1321). This code implements the MD5 Algorithm defined in RFC 1321, whose text is available at http://www.ietf.org/rfc/rfc1321.txt The code is derived from the text of the RFC, including the test suite (section A.5) but excluding the rest of Appendix A. It does not include any code or documentation that is identified in the RFC as being copyrighted. The original and principal author of md5.c is L. Peter Deutsch <gh...@al...>. Other authors are noted in the change history that follows (in reverse chronological order): 2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order either statically or dynamically; added missing #include <string.h> in library. 2002-03-11 lpd Corrected argument list for main(), and added int return type, in test program and T value program. 2002-02-21 lpd Added missing #include <stdio.h> in test program. 2000-07-03 lpd Patched to eliminate warnings about "constant is unsigned in ANSI C, signed in traditional"; made test program self-checking. 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). 1999-05-03 lpd Original version. */ #include "md5.h" #include <string.h> #undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */ #ifdef ARCH_IS_BIG_ENDIAN # define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1) #else # define BYTE_ORDER 0 #endif #define T_MASK ((md5_word_t)~0) #define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87) #define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9) #define T3 0x242070db #define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111) #define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050) #define T6 0x4787c62a #define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec) #define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe) #define T9 0x698098d8 #define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850) #define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e) #define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841) #define T13 0x6b901122 #define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c) #define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71) #define T16 0x49b40821 #define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d) #define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf) #define T19 0x265e5a51 #define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855) #define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2) #define T22 0x02441453 #define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e) #define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437) #define T25 0x21e1cde6 #define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829) #define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278) #define T28 0x455a14ed #define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa) #define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07) #define T31 0x676f02d9 #define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375) #define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd) #define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e) #define T35 0x6d9d6122 #define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3) #define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb) #define T38 0x4bdecfa9 #define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f) #define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f) #define T41 0x289b7ec6 #define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805) #define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a) #define T44 0x04881d05 #define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6) #define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a) #define T47 0x1fa27cf8 #define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a) #define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb) #define T50 0x432aff97 #define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58) #define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6) #define T53 0x655b59c3 #define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d) #define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82) #define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e) #define T57 0x6fa87e4f #define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f) #define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb) #define T60 0x4e0811a1 #define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d) #define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca) #define T63 0x2ad7d2bb #define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) static void md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) { md5_word_t a = pms->abcd[0], b = pms->abcd[1], c = pms->abcd[2], d = pms->abcd[3]; md5_word_t t; #if BYTE_ORDER > 0 /* Define storage only for big-endian CPUs. */ md5_word_t X[16]; #else /* Define storage for little-endian or both types of CPUs. */ md5_word_t xbuf[16]; const md5_word_t *X; #endif { #if BYTE_ORDER == 0 /* * Determine dynamically whether this is a big-endian or * little-endian machine, since we can use a more efficient * algorithm on the latter. */ static const int w = 1; if (*((const md5_byte_t *)&w)) /* dynamic little-endian */ #endif #if BYTE_ORDER <= 0 /* little-endian */ { /* * On little-endian machines, we can process properly aligned * data without copying it. */ if (!((data - (const md5_byte_t *)0) & 3)) { /* data are properly aligned */ X = (const md5_word_t *)data; } else { /* not aligned */ memcpy(xbuf, data, 64); X = xbuf; } } #endif #if BYTE_ORDER == 0 else /* dynamic big-endian */ #endif #if BYTE_ORDER >= 0 /* big-endian */ { /* * On big-endian machines, we must arrange the bytes in the * right order. */ const md5_byte_t *xp = data; int i; # if BYTE_ORDER == 0 X = xbuf; /* (dynamic only) */ # else # define xbuf X /* (static only) */ # endif for (i = 0; i < 16; ++i, xp += 4) xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); } #endif } #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) /* Round 1. */ /* Let [abcd k s i] denote the operation a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */ #define F(x, y, z) (((x) & (y)) | (~(x) & (z))) #define SET(a, b, c, d, k, s, Ti)\ t = a + F(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ SET(a, b, c, d, 0, 7, T1); SET(d, a, b, c, 1, 12, T2); SET(c, d, a, b, 2, 17, T3); SET(b, c, d, a, 3, 22, T4); SET(a, b, c, d, 4, 7, T5); SET(d, a, b, c, 5, 12, T6); SET(c, d, a, b, 6, 17, T7); SET(b, c, d, a, 7, 22, T8); SET(a, b, c, d, 8, 7, T9); SET(d, a, b, c, 9, 12, T10); SET(c, d, a, b, 10, 17, T11); SET(b, c, d, a, 11, 22, T12); SET(a, b, c, d, 12, 7, T13); SET(d, a, b, c, 13, 12, T14); SET(c, d, a, b, 14, 17, T15); SET(b, c, d, a, 15, 22, T16); #undef SET /* Round 2. */ /* Let [abcd k s i] denote the operation a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */ #define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) #define SET(a, b, c, d, k, s, Ti)\ t = a + G(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ SET(a, b, c, d, 1, 5, T17); SET(d, a, b, c, 6, 9, T18); SET(c, d, a, b, 11, 14, T19); SET(b, c, d, a, 0, 20, T20); SET(a, b, c, d, 5, 5, T21); SET(d, a, b, c, 10, 9, T22); SET(c, d, a, b, 15, 14, T23); SET(b, c, d, a, 4, 20, T24); SET(a, b, c, d, 9, 5, T25); SET(d, a, b, c, 14, 9, T26); SET(c, d, a, b, 3, 14, T27); SET(b, c, d, a, 8, 20, T28); SET(a, b, c, d, 13, 5, T29); SET(d, a, b, c, 2, 9, T30); SET(c, d, a, b, 7, 14, T31); SET(b, c, d, a, 12, 20, T32); #undef SET /* Round 3. */ /* Let [abcd k s t] denote the operation a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */ #define H(x, y, z) ((x) ^ (y) ^ (z)) #define SET(a, b, c, d, k, s, Ti)\ t = a + H(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ SET(a, b, c, d, 5, 4, T33); SET(d, a, b, c, 8, 11, T34); SET(c, d, a, b, 11, 16, T35); SET(b, c, d, a, 14, 23, T36); SET(a, b, c, d, 1, 4, T37); SET(d, a, b, c, 4, 11, T38); SET(c, d, a, b, 7, 16, T39); SET(b, c, d, a, 10, 23, T40); SET(a, b, c, d, 13, 4, T41); SET(d, a, b, c, 0, 11, T42); SET(c, d, a, b, 3, 16, T43); SET(b, c, d, a, 6, 23, T44); SET(a, b, c, d, 9, 4, T45); SET(d, a, b, c, 12, 11, T46); SET(c, d, a, b, 15, 16, T47); SET(b, c, d, a, 2, 23, T48); #undef SET /* Round 4. */ /* Let [abcd k s t] denote the operation a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */ #define I(x, y, z) ((y) ^ ((x) | ~(z))) #define SET(a, b, c, d, k, s, Ti)\ t = a + I(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ SET(a, b, c, d, 0, 6, T49); SET(d, a, b, c, 7, 10, T50); SET(c, d, a, b, 14, 15, T51); SET(b, c, d, a, 5, 21, T52); SET(a, b, c, d, 12, 6, T53); SET(d, a, b, c, 3, 10, T54); SET(c, d, a, b, 10, 15, T55); SET(b, c, d, a, 1, 21, T56); SET(a, b, c, d, 8, 6, T57); SET(d, a, b, c, 15, 10, T58); SET(c, d, a, b, 6, 15, T59); SET(b, c, d, a, 13, 21, T60); SET(a, b, c, d, 4, 6, T61); SET(d, a, b, c, 11, 10, T62); SET(c, d, a, b, 2, 15, T63); SET(b, c, d, a, 9, 21, T64); #undef SET /* Then perform the following additions. (That is increment each of the four registers by the value it had before this block was started.) */ pms->abcd[0] += a; pms->abcd[1] += b; pms->abcd[2] += c; pms->abcd[3] += d; } void md5_init(md5_state_t *pms) { pms->count[0] = pms->count[1] = 0; pms->abcd[0] = 0x67452301; pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476; pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301; pms->abcd[3] = 0x10325476; } void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) { const md5_byte_t *p = data; int left = nbytes; int offset = (pms->count[0] >> 3) & 63; md5_word_t nbits = (md5_word_t)(nbytes << 3); if (nbytes <= 0) return; /* Update the message length. */ pms->count[1] += nbytes >> 29; pms->count[0] += nbits; if (pms->count[0] < nbits) pms->count[1]++; /* Process an initial partial block. */ if (offset) { int copy = (offset + nbytes > 64 ? 64 - offset : nbytes); memcpy(pms->buf + offset, p, copy); if (offset + copy < 64) return; p += copy; left -= copy; md5_process(pms, pms->buf); } /* Process full blocks. */ for (; left >= 64; p += 64, left -= 64) md5_process(pms, p); /* Process a final partial block. */ if (left) memcpy(pms->buf, p, left); } void md5_finish(md5_state_t *pms, md5_byte_t digest[16]) { static const md5_byte_t pad[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; md5_byte_t data[8]; int i; /* Save the length before padding. */ for (i = 0; i < 8; ++i) data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3)); /* Pad to 56 bytes mod 64. */ md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1); /* Append the length. */ md5_append(pms, data, 8); for (i = 0; i < 16; ++i) digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3)); } Index: Process.h =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/Process.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Process.h 1 May 2007 19:40:16 -0000 1.2 --- Process.h 27 May 2007 09:14:52 -0000 1.3 *************** *** 1,60 **** ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #ifndef __JSMOOTHCOREPROCESS_H_ ! #define __JSMOOTHCOREPROCESS_H_ ! ! ! #include <process.h> ! #include <windows.h> ! #include <winbase.h> ! ! #include <string> ! #include <stdio.h> ! /** ! * Provides basic string operations. ! * ! * @author Rodrigo Reyes <re...@ch...> ! */ ! ! class Process ! { ! PROCESS_INFORMATION m_procinfo; ! bool m_useconsole; ! std::string m_commandline; ! bool m_started; ! std::string m_redirection; ! bool m_redirectstderr; ! HANDLE m_redirectHandle; ! DWORD m_exitCode; ! ! public: ! Process(const std::string& commandline, bool useconsole); ! ! void setRedirect(const std::string& filename); ! ! bool run(); ! void join(); ! ! int getExitCode(); ! }; ! ! ! #endif --- 1,62 ---- ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #ifndef __JSMOOTHCOREPROCESS_H_ ! #define __JSMOOTHCOREPROCESS_H_ ! ! ! #include <process.h> ! #include <windows.h> ! #include <winbase.h> ! ! #include <string> ! #include <stdio.h> ! /** ! * Provides basic string operations. ! * ! * @author Rodrigo Reyes <re...@ch...> ! */ ! ! class Process ! { ! PROCESS_INFORMATION m_procinfo; ! bool m_useconsole; ! std::string m_commandline; ! bool m_started; ! std::string m_redirection; ! bool m_redirectstderr; ! HANDLE m_redirectHandle; ! DWORD m_exitCode; ! ! public: ! Process(const std::string& commandline, bool useconsole); ! ! void setRedirect(const std::string& filename); ! ! bool run(); ! void join(); ! ! DWORD getProcessId(); ! ! int getExitCode(); ! }; ! ! ! #endif Index: Thread.h =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/Thread.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Thread.h 9 Apr 2007 17:17:04 -0000 1.1 --- Thread.h 27 May 2007 09:14:51 -0000 1.2 *************** *** 1,87 **** ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #ifndef __JSMOOTHCORETHREAD_H_ ! #define __JSMOOTHCORETHREAD_H_ ! ! ! #include <process.h> ! #include <windows.h> ! #include <winbase.h> ! ! #include <stdio.h> ! /** ! * Provides basic string operations. ! * ! * @author Rodrigo Reyes <re...@ch...> ! */ ! ! class Thread ! { ! protected: ! unsigned long m_threadId; ! void (*m_callback)(void*); ! void* m_param; ! bool m_stopRequested; ! ! public: ! Thread(); ! ! /** ! * Starts the thread, and execute the run() method. ! */ ! void start(); ! ! /** ! * Starts the thread and execute the run method. If the run method ! * is not overloaded, it executes the callback fonction, and pass ! * the param as parameter to the function. ! */ ! void start(void (*callback)(void*), void* param); ! ! /** ! * The method executed by the thread. ! */ ! void run(); ! ! /* ! * Waits for the thread to complete ! */ ! void join(); ! ! /* ! * Waits for the thread to complete. If the timeout (millis) is ! * reached, returns false. Returns true if the thread ended. ! */ ! bool join(int millis); ! ! /** ! * Waits a number of milliseconds. ! */ ! static void sleep(int millis); ! ! bool isStopRequested(); ! ! void setStopRequested(bool stop=true); ! ! }; ! ! ! #endif --- 1,91 ---- ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #ifndef __JSMOOTHCORETHREAD_H_ ! #define __JSMOOTHCORETHREAD_H_ ! ! ! #include <process.h> ! #include <windows.h> ! #include <winbase.h> ! ! #include <stdio.h> ! /** ! * Provides basic string operations. ! * ! * @author Rodrigo Reyes <re...@ch...> ! */ ! ! class Thread ! { ! protected: ! unsigned long m_threadId; ! void (*m_callback)(void*); ! void* m_param; ! bool m_stopRequested; ! bool m_autodelete; ! ! public: ! Thread(); ! ! /** ! * Starts the thread, and execute the run() method. ! */ ! void start(); ! ! /** ! * Starts the thread and execute the run method. If the run method ! * is not overloaded, it executes the callback fonction, and pass ! * the param as parameter to the function. ! */ ! void start(void (*callback)(void*), void* param); ! ! /** ! * The method executed by the thread. ! */ ! void run(); ! ! /* ! * Waits for the thread to complete ! */ ! void join(); ! ! /* ! * Waits for the thread to complete. If the timeout (millis) is ! * reached, returns false. Returns true if the thread ended. ! */ ! bool join(int millis); ! ! /** ! * Waits a number of milliseconds. ! */ ! static void sleep(int millis); ! ! bool isStopRequested(); ! ! void setStopRequested(bool stop=true); ! ! void setAutoDelete(bool v); ! bool isAutoDelete(); ! ! }; ! ! ! #endif Index: Makefile.win =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/Makefile.win,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.win 17 May 2007 10:56:18 -0000 1.5 --- Makefile.win 27 May 2007 09:14:52 -0000 1.6 *************** *** 1,32 **** ! # Project: util-core ! ! PROJECTNAME=util-core ! RM = rm -f ! CPP = g++.exe ! CC = gcc.exe ! WINDRES = windres.exe ! MINGW = ! RES = ! OBJ = SingleInstanceManager.o Process.o Log.o Thread.o FileUtils.o StringUtils.o DebugConsole.o $(RES) ! LIBS = -L"$(MINGW)/lib" -L"/lib" -lws2_32 ! INCS = -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32" ! CXXINCS = -Os -I"$(MINGW)/include/c++" -I"$(MINGW)/include/c++/mingw32" -I"$(MINGW)/include/c++/backward" -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32" ! BIN = $(PROJECTNAME).a ! CXXFLAGS = $(CUSTOMFLAGS) $(CXXINCS) -DJDK="$(JDK)" ! CFLAGS = $(INCS) ! ! .PHONY: all all-before all-after clean clean-custom $(PROJECTNAME) ! ! all: all-before $(PROJECTNAME).a testmain.cpp all-after ! ! ! clean: clean-custom ! $(RM) $(OBJ) $(BIN) testmain.o test.exe ! ! $(BIN): $(OBJ) ! ar r $(BIN) $(OBJ) ! ranlib $(BIN) ! $(CPP) $(OBJ) testmain.o -o test.exe $(LIBS) ! ! $(PROJECTNAME).a: $(OBJ) testmain.o ! --- 1,32 ---- ! # Project: util-core ! ! PROJECTNAME=util-core ! RM = rm -f ! CPP = g++.exe ! CC = gcc.exe ! WINDRES = windres.exe ! MINGW = ! RES = ! OBJ = md5.o RegistryKey.o SingleInstanceManager.o Process.o Log.o Thread.o FileUtils.o StringUtils.o DebugConsole.o $(RES) ! LIBS = -L"$(MINGW)/lib" -L"/lib" -lws2_32 ! INCS = -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32" ! CXXINCS = -Os -I"$(MINGW)/include/c++" -I"$(MINGW)/include/c++/mingw32" -I"$(MINGW)/include/c++/backward" -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32" ! BIN = $(PROJECTNAME).a ! CXXFLAGS = $(CUSTOMFLAGS) $(CXXINCS) -DJDK="$(JDK)" ! CFLAGS = $(INCS) ! ! .PHONY: all all-before all-after clean clean-custom $(PROJECTNAME) ! ! all: all-before $(PROJECTNAME).a testmain.cpp all-after ! ! ! clean: clean-custom ! $(RM) $(OBJ) $(BIN) testmain.o test.exe ! ! $(BIN): $(OBJ) ! ar r $(BIN) $(OBJ) ! ranlib $(BIN) ! $(CPP) testmain.o -o test.exe $(BIN) ! ! $(PROJECTNAME).a: $(OBJ) testmain.o ! Index: Process.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/Process.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Process.cpp 4 May 2007 20:53:28 -0000 1.3 --- Process.cpp 27 May 2007 09:14:52 -0000 1.4 *************** *** 1,118 **** ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include "Process.h" ! #include "StringUtils.h" ! ! Process::Process(const std::string& commandline, bool useconsole) ! { ! m_commandline = commandline; ! m_useconsole = useconsole; ! m_started = false; ! m_redirectHandle = INVALID_HANDLE_VALUE; ! } ! ! ! void Process::setRedirect(const std::string& filename) ! { ! m_redirection = filename; ! m_useconsole = true; ! } ! ! bool Process::run() ! { ! STARTUPINFO info; ! GetStartupInfo(&info); ! int creationFlags = 0; ! int inheritsHandle; ! ! if (m_useconsole == true) ! { ! info.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; ! info.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); ! info.hStdError = GetStdHandle(STD_ERROR_HANDLE); ! info.hStdInput = GetStdHandle(STD_INPUT_HANDLE); ! creationFlags = NORMAL_PRIORITY_CLASS; ! inheritsHandle = TRUE; ! } ! else ! { ! info.dwFlags = STARTF_USESHOWWINDOW; ! creationFlags = NORMAL_PRIORITY_CLASS | DETACHED_PROCESS; ! inheritsHandle = FALSE; ! } ! ! if (m_redirection.size() > 0) ! { ! SECURITY_ATTRIBUTES secattrs; ! secattrs.nLength = sizeof(SECURITY_ATTRIBUTES); ! secattrs.lpSecurityDescriptor = NULL; ! secattrs.bInheritHandle = TRUE; ! ! m_redirectHandle = CreateFile(m_redirection.c_str(), GENERIC_WRITE, ! FILE_SHARE_WRITE, &secattrs, ! CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ! ! if (m_redirectHandle == INVALID_HANDLE_VALUE) ! { ! return false; ! } ! info.hStdOutput = m_redirectHandle; ! info.hStdError = m_redirectHandle; ! info.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; ! info.lpTitle = NULL; ! info.wShowWindow = SW_HIDE; // OR SW_SHOWMINIMIZED? SW_SHOWMINNOACTIVE? ! } ! ! // string exeline = StringUtils::fixQuotes(exepath) + " " + arguments; ! int res = CreateProcess(NULL, (char*)m_commandline.c_str(), ! NULL, NULL, inheritsHandle, creationFlags, ! NULL, NULL, &info, &m_procinfo); ! ! if (res != 0) ! { ! m_started = true; ! return true; ! } ! ! return false; ! } ! ! void Process::join() ! { ! if (!m_started) ! return; ! ! WaitForSingleObject(m_procinfo.hProcess, INFINITE); ! ! if (m_redirectHandle != INVALID_HANDLE_VALUE) ! { ! CloseHandle(m_redirectHandle); ! } ! ! } ! ! int Process::getExitCode() ! { ! GetExitCodeProcess(m_procinfo.hProcess, ! &m_exitCode); ! return (int)m_exitCode; ! } ! --- 1,122 ---- ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include "Process.h" ! #include "StringUtils.h" ! ! Process::Process(const std::string& commandline, bool useconsole) ! { ! m_commandline = commandline; ! m_useconsole = useconsole; ! m_started = false; ! m_redirectHandle = INVALID_HANDLE_VALUE; ! } ! ! ! void Process::setRedirect(const std::string& filename) ! { ! m_redirection = filename; ! m_useconsole = true; ! } ! ! bool Process::run() ! { ! STARTUPINFO info; ! GetStartupInfo(&info); ! int creationFlags = 0; ! int inheritsHandle; ! ! if (m_useconsole == true) ! { ! info.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; ! info.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); ! info.hStdError = GetStdHandle(STD_ERROR_HANDLE); ! info.hStdInput = GetStdHandle(STD_INPUT_HANDLE); ! creationFlags = NORMAL_PRIORITY_CLASS; ! inheritsHandle = TRUE; ! } ! else ! { ! info.dwFlags = STARTF_USESHOWWINDOW; ! creationFlags = NORMAL_PRIORITY_CLASS | DETACHED_PROCESS; ! inheritsHandle = FALSE; ! } ! ! if (m_redirection.size() > 0) ! { ! SECURITY_ATTRIBUTES secattrs; ! secattrs.nLength = sizeof(SECURITY_ATTRIBUTES); ! secattrs.lpSecurityDescriptor = NULL; ! secattrs.bInheritHandle = TRUE; ! ! m_redirectHandle = CreateFile(m_redirection.c_str(), GENERIC_WRITE, ! FILE_SHARE_WRITE, &secattrs, ! CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ! ! if (m_redirectHandle == INVALID_HANDLE_VALUE) ! { ! return false; ! } ! info.hStdOutput = m_redirectHandle; ! info.hStdError = m_redirectHandle; ! info.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; ! info.lpTitle = NULL; ! info.wShowWindow = SW_HIDE; // OR SW_SHOWMINIMIZED? SW_SHOWMINNOACTIVE? ! } ! ! // string exeline = StringUtils::fixQuotes(exepath) + " " + arguments; ! int res = CreateProcess(NULL, (char*)m_commandline.c_str(), ! NULL, NULL, inheritsHandle, creationFlags, ! NULL, NULL, &info, &m_procinfo); ! ! if (res != 0) ! { ! m_started = true; ! return true; ! } ! ! return false; ! } ! ! void Process::join() ! { ! if (!m_started) ! return; ! ! WaitForSingleObject(m_procinfo.hProcess, INFINITE); ! ! if (m_redirectHandle != INVALID_HANDLE_VALUE) ! { ! CloseHandle(m_redirectHandle); ! } ! ! } ! ! int Process::getExitCode() ! { ! GetExitCodeProcess(m_procinfo.hProcess, ! &m_exitCode); ! return (int)m_exitCode; ! } ! ! DWORD Process::getProcessId() ! { ! return m_procinfo.dwProcessId; ! } Index: testmain.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/testmain.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** testmain.cpp 17 May 2007 10:56:19 -0000 1.5 --- testmain.cpp 27 May 2007 09:14:52 -0000 1.6 *************** *** 1,88 **** ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include <iostream> ! #include <stdlib.h> ! ! #include "StringUtils.h" ! #include <winnls.h> ! #include "FileUtils.h" ! #include "Process.h" ! ! #include "SingleInstanceManager.h" ! ! void _debugOutput(const std::string& text) ! { ! printf("%s\n", text.c_str()); ! } ! ! void _debugWaitKey() ! { ! } ! ! int main(int argc, char *argv[]) ! { ! // char buffer[256]; ! // buffer[0] = 0; ! // int res = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME, ! // buffer, 255); ! ! // if (res > 0) ! // printf("result: %s\n", buffer); ! ! SingleInstanceManager singinst; ! if (singinst.alreadyExists()) ! { ! printf("Already running...\n"); ! exit(0); ! } ! else ! Sleep(50000); ! ! std::string exeline = "C:\\Program Files\\Java\\jdk1.5.0_11\\bin\\java.exe -version"; ! string tmpfilename = FileUtils::createTempFileName(".tmp"); ! ! Process proc(exeline, true); ! proc.setRedirect(tmpfilename); ! proc.run(); ! proc.join(); ! ! std::string voutput = FileUtils::readFile(tmpfilename); ! // printf("GOT: %s\n", voutput.c_str()); ! ! // std::string cmdlinetest = " \"this is my\ test\\\" \"here and then\""; ! // cmdlinetest = " \"this is my\ test here\\\" \"and\" \"then\""; ! // printf("splitting line <%s>\n", cmdlinetest.c_str()); ! // std::vector<std::string> args = StringUtils::split(cmdlinetest, " \t\n\r", "\"'", false, false); ! // for (int i=0; i<args.size(); i++) ! // { ! // printf("ARG[%d]=%s\n", i, args[i].c_str(), false, false); ! // } ! ! // std::string fqmethod = "void mytest1(java.lang.String test[ ] ) "; ! // std::vector<std::string> t1 = StringUtils::split(fqmethod, " \t(,);][", "", false, true); ! ! // for (std::vector<std::string>::iterator i=t1.begin(); i != t1.end(); i++) ! // printf("TOK: %s\n" , i->c_str()); ! ! // std::string readf = FileUtils::readFile("Log.h"); ! // printf("READ: <<%s>>", readf.c_str()); ! ! } --- 1,99 ---- ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include <iostream> ! #include <stdlib.h> ! ! #include "StringUtils.h" ! #include <winnls.h> ! #include "FileUtils.h" ! #include "Process.h" ! ! #include "SingleInstanceManager.h" ! #include "RegistryKey.h" ! ! void _debugOutput(const std::string& text) ! { ! printf("%s\n", text.c_str()); ! } ! ! void _debugWaitKey() ! { ! } ! ! int main(int argc, char *argv[]) ! { ! ! RegistryKey k(RegistryKey::CURRENT_USER, "Software\\JSmooth"); ! RegistryKey k2(k, "Test"); ! ! // k.set("HAB", "ceci est un test"); ! // k.set("HAB2", 1234); ! ! printf("HAB = %s\n", k.getString("HAB").c_str()); ! printf("HAB2 = %d\n", k.getInt("HAB2")); ! ! // char buffer[256]; ! // buffer[0] = 0; ! // int res = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME, ! // buffer, 255); ! ! // if (res > 0) ! // printf("result: %s\n", buffer); ! ! // SingleInstanceManager singinst; ! // if (singinst.alreadyExists()) ! // { ! // printf("Already running...\n"); ! // exit(0); ! // } ! // else ! // Sleep(50000); ! ! // std::string exeline = "C:\\Program Files\\Java\\jdk1.5.0_11\\bin\\java.exe -version"; ! // string tmpfilename = FileUtils::createTempFileName(".tmp"); ! ! // Process proc(exeline, true); ! // proc.setRedirect(tmpfilename); ! // proc.run(); ! // proc.join(); ! ! // std::string voutput = FileUtils::readFile(tmpfilename); ! // printf("GOT: %s\n", voutput.c_str()); ! ! // std::string cmdlinetest = " \"this is my\ test\\\" \"here and then\""; ! // cmdlinetest = " \"this is my\ test here\\\" \"and\" \"then\""; ! // printf("splitting line <%s>\n", cmdlinetest.c_str()); ! // std::vector<std::string> args = StringUtils::split(cmdlinetest, " \t\n\r", "\"'", false, false); ! // for (int i=0; i<args.size(); i++) ! // { ! // printf("ARG[%d]=%s\n", i, args[i].c_str(), false, false); ! // } ! ! // std::string fqmethod = "void mytest1(java.lang.String test[ ] ) "; ! // std::vector<std::string> t1 = StringUtils::split(fqmethod, " \t(,);][", "", false, true); ! ! // for (std::vector<std::string>::iterator i=t1.begin(); i != t1.end(); i++) ! // printf("TOK: %s\n" , i->c_str()); ! ! // std::string readf = FileUtils::readFile("Log.h"); ! // printf("READ: <<%s>>", readf.c_str()); ! ! } --- NEW FILE: RegistryKey.h --- /* JSmooth: a VM wrapper toolkit for Windows Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __REGISTRYKEY_H_ #define __REGISTRYKEY_H_ #include <string> #include <vector> #include <windows.h> class RegistryKey { private: HKEY m_key; public: enum KEYBASE { CURRENT_USER = 1, LOCAL_MACHINE = 2, USERS = 3 } ; RegistryKey(KEYBASE parent, const std::string& subkey); RegistryKey(const RegistryKey& parent, const std::string& subkey); ~RegistryKey(); void set(const std::string& name, const std::string& value); void set(const std::string& name, DWORD value); std::string getString(const std::string& name); DWORD getInt(const std::string& name); private: void init(HKEY key, const std::string& subkey); }; #endif Index: Thread.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/Thread.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Thread.cpp 9 Apr 2007 17:17:04 -0000 1.1 --- Thread.cpp 27 May 2007 09:14:51 -0000 1.2 *************** *** 1,99 **** ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include "Thread.h" ! ! void thread_support_fn(void* param) ! { ! Thread *t = (Thread*) param; ! try { ! t->run(); ! } catch (...) ! { ! // ! } ! _endthread(); ! } ! ! Thread::Thread() ! { ! m_callback = 0; ! } ! ! void Thread::start() ! { ! m_threadId = _beginthread((void( __cdecl * )( void * ))thread_support_fn, 0, (void*) this); ! } ! ! void Thread::start(void (*callback)(void*), void* param) ! { ! m_callback = callback; ! m_param = param; ! m_threadId = _beginthread((void( __cdecl * )( void * ))thread_support_fn, 0, (void*) this); ! } ! ! void Thread::run() ! { ! if (m_callback != 0) ! { ! (*m_callback)(m_param); ! } ! } ! ! void Thread::sleep(int millis) ! { ! Sleep(millis); ! } ! ! void Thread::join() ! { ! WaitForSingleObject ( (void*)m_threadId, INFINITE ); ! } ! ! bool Thread::join(int millis) ! { ! int result = WaitForSingleObject( (void*)m_threadId, millis); ! switch(result) ! { ! case WAIT_ABANDONED: ! printf("WAIT_ABANDONED\n"); ! break; ! case WAIT_OBJECT_0: ! printf("WAIT_OBJECT_0"); ! return true; ! break; ! case WAIT_TIMEOUT: ! printf("WAIT_TIMEOUT"); ! break; ! } ! ! return false; ! } ! ! ! bool Thread::isStopRequested() ! { ! return m_stopRequested; ! } ! ! void Thread::setStopRequested(bool stop) ! { ! m_stopRequested = stop; ! } --- 1,117 ---- ! /* ! JSmooth: a VM wrapper toolkit for Windows ! Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...> ! ! This library is free software; you can redistribute it and/or ! modify it under the terms of the GNU Library General Public ! License as published by the Free Software Foundation; either ! version 2 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 ! Library General Public License for more details. ! ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free ! Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! ! */ ! ! #include "Thread.h" ! ! void thread_support_fn(void* param) ! { ! Thread *t = (Thread*) param; ! try { ! t->run(); ! } catch (...) ! { ! // ! } ! _endthread(); ! ! if (t->isAutoDelete()) ! { ! delete t; ! } ! } ! ! Thread::Thread() ! { ! m_callback = 0; ! m_autodelete = false; ! } ! ! void Thread::start() ! { ! m_threadId = _beginthread((void( __cdecl * )( void * ))thread_support_fn, 0, (void*) this); ! } ! ! void Thread::start(void (*callback)(void*), void* param) ! { ! m_callback = callback; ! m_param = param; ! m_threadId = _beginthread((void( __cdecl * )( void * ))thread_support_fn, 0, (void*) this); ! } ! ! void Thread::run() ! { ! if (m_callback != 0) ! { ! (*m_callback)(m_param); ! } ! } ! ! void Thread::sleep(int millis) ! { ! Sleep(millis); ! } ! ! void Thread::join() ! { ! WaitForSingleObject ( (void*)m_threadId, INFINITE ); ! } ! ! bool Thread::join(int millis) ! { ! int result = WaitForSingleObject( (void*)m_threadId, millis); ! switch(result) ! { ! case WAIT_ABANDONED: ! printf("WAIT_ABANDONED\n"); ! break; ! case WAIT_OBJECT_0: ! printf("WAIT_OBJECT_0"); ! return true; ! break; ! case WAIT_TIMEOUT: ! printf("WAIT_TIMEOUT"); ! break; ! } ! ! return false; ! } ! ! ! bool Thread::isStopRequested() ! { ! return m_stopRequested; ! } ! ! void Thread::setStopRequested(bool stop) ! { ! m_stopRequested = stop; ! } ! ! void Thread::setAutoDelete(bool v) ! { ! m_autodelete = v; ! } ! ! bool Thread::isAutoDelete() ! { ! return m_autodelete; ! } ! ! |