From 6be605d10fb8d98cd0cd95ea7f9179f73e67b8ed Mon Sep 17 00:00:00 2001 From: pixel Date: Thu, 24 Feb 2005 11:30:04 +0000 Subject: Huh ? Normalizing (again) crlfs.... --- Dalos/Dalos.cc | 716 ++++++++++----------- Dalos/Hexview.cc | 400 ++++++------ MSVC/Dalos/Dalos.vcproj | 406 ++++++------ .../PSX-Bundle - library.vcproj | 618 +++++++++--------- MSVC/mogltk/mogltk.vcproj | 578 ++++++++--------- lib/crctable.out | 182 +++--- lib/crctables | 232 +++---- luapatch-res.h | 84 +-- luapatch.rc | 515 ++++++++------- nmakefile | 40 +- 10 files changed, 1891 insertions(+), 1880 deletions(-) diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc index b6e6a75..4a045ef 100644 --- a/Dalos/Dalos.cc +++ b/Dalos/Dalos.cc @@ -1,358 +1,358 @@ -/* - * Dalos - * Copyright (C) 2003-2005 Nicolas "Pixel" Noble - * - * 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 - */ - -/* $Id: Dalos.cc,v 1.14 2004-12-29 01:58:33 pixel Exp $ */ - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include - -#include "cd-tool-hc.h" - -#ifdef __MINGW32__ -#define main SDL_main -#endif - - -// all these global variables are ugly... -bool auto_exec = true; -bool lua_started = false; -bool do_lua_break = false; - -CODE_BEGINS - -mogltk::widgets::Root * Root; -mogltk::widget * Frame, * MainPanel; -mogltk::widgets::Menu * MainMenu; - -class threaded_Lua : public Lua { - public: - threaded_Lua() : mutex(SDL_CreateMutex()) { } - virtual ~threaded_Lua() { SDL_DestroyMutex(mutex); } - virtual void lock() { - SDL_mutexP(mutex); - } - virtual void unlock() { - SDL_mutexV(mutex); - } - private: - SDL_mutex * mutex; -}; - -class threaded_locker : public locker_t { - public: - threaded_locker() : mutex(SDL_CreateMutex()) { } - virtual ~threaded_locker() { SDL_DestroyMutex(mutex); } - virtual void lock() { - SDL_mutexP(mutex); - } - virtual void unlock() { - SDL_mutexV(mutex); - } - private: - SDL_mutex * mutex; -}; - -static int lua_print(lua_State * _L) { - Lua * L = Lua::find(_L); - String t = L->tostring() + "\n"; - char * tc = t.strdup(); - - printm(M_STATUS, "%s", tc); - - free(tc); - - return 0; -} - -static void lua_hook(lua_State * _L, lua_Debug * ar) { - if (!lua_started) - return; - Lua * L = Lua::find(_L); - - if (do_lua_break) { - L->do_break(); - do_lua_break = false; - } -} - -void start_lua() { - Lua * L = new threaded_Lua(); - bool use_builtin_cdtool = false; - int i; - - L->open_base(); - L->open_math(); - L->open_string(); - L->open_table(); - - LuaInput::pushconstruct(L); - LuaOutput::pushconstruct(L); - LuaBuffer::pushconstruct(L); - - CD_PUSHSTATICS(L); - Luapsx::pushstatics(L); - - L->push("print"); - L->push(lua_print); - L->setvar(); - - L->sethook(lua_hook, LUA_MASKLINE, 0); - - console_lock = SDL_CreateMutex(); - console_sem = SDL_CreateSemaphore(0); - - try { - L->load(&Input("cd-tool.lua")); - } catch (GeneralException e) { - printm(M_WARNING, "There was an error loading cd-tool.lua: %s, using built-in.\n", e.GetMsg()); - use_builtin_cdtool = true; - } - - if (use_builtin_cdtool) { - Buffer built; - built.write(cd_tool_lua, cd_tool_lua_size); - try { - L->load(&built); - } - catch (GeneralException e) { - printm(M_WARNING, "There was an error loading built-in cd-tool.lua: %s\n", e.GetMsg()); - } - } - - SDL_CreateThread(LuaThread, L); -} - -static int LuaThread(void * d) { - Lua * L = (Lua *) d; - while (true) { - SDL_SemWait(console_sem); - lua_started = true; - SDL_mutexP(console_lock); - try { - L->load(&console_buffer); - } - catch (LuaException e) { - /* If there was an error, ignore it, and free the stack */ - while(L->gettop()) - L->pop(); - } - catch (GeneralException e) { - /* A more severe exception... */ - while(L->gettop()) - L->pop(); - printm(M_ERROR, "Aborted. LUA caused the following exception: %s\n", e.GetMsg()); - } - SDL_mutexV(console_lock); - lua_started = false; - } -} - -class myprinter : public printer_t { - public: - myprinter() : lock(SDL_CreateMutex()) { } - virtual ~myprinter() { SDL_DestroyMutex(lock); } - virtual bool printm(int level, const char * m, va_list ap) { - static String heads[] = {"EE", "--", "WW", "II"}; - static char buffer[20480]; - - if (level >= M_INFO) - return true; - - SDL_mutexP(lock); - - vsnprintf(buffer, 20479, m, ap); - if (level >= 0) - CurrentConsole->add_line("(" + heads[level] + ") " + buffer); - else - CurrentConsole->add_line(buffer); - - SDL_mutexV(lock); - - return true; - } - private: - SDL_mutex * lock; -}; - -class frame : public mogltk::widget { - public: - frame(mogltk::shape * sh, mogltk::widget * father) : - widget(father, 2, 2, father->GetW() - 4, father->GetH() - 4, 0, "MyFrame", sh) { } - protected: - virtual void draw() { - } - virtual mogltk::rect GetDrawRect() { - mogltk::rect r; - - r.x = GetX() + 2; - r.y = GetY() + 2; - r.w = GetW() - 4; - r.h = GetH() - 4; - - return r; - } - virtual bool process_event(int mx, int my, mogltk::event_t event) { - mx -= GetAX(); - my -= GetAY(); - return false; - } - virtual void resize_notify() { - resize(Father()->GetW() - 4, Father()->GetH() - 4); - } -}; - -class timer : public mogltk::widget { - public: - timer() : - widget(Application->Root, 0, 0, 0, 0, 0, "Timer", 0), tick(0) - { set_timed_event(100); } - protected: - virtual bool process_event(int, int, mogltk::event_t event) { - if (event == mogltk::E_TIMER) { - set_timed_event(100); - tick = (tick + 1) % 4; - switch (tick) { - case 0: - Application->MainMenu->SetCaption(0, "/"); - break; - case 1: - Application->MainMenu->SetCaption(0, "-"); - break; - case 2: - Application->MainMenu->SetCaption(0, "\\"); - break; - case 3: - Application->MainMenu->SetCaption(0, "I"); - break; - } - Application->MainMenu->SetCaption(3, String("FPS: ") + mogltk::engine::FPS()); - return true; - } - return false; - } - private: - int tick; -}; - -class quit : public mogltk::widgets::action { - public: - virtual void do_action(mogltk::widget * w) { - mogltk::engine::quit(); - } -} action_quit; - -class about : public mogltk::widgets::action { - public: - virtual void do_action(mogltk::widget * w) { - new mogltk::widgets::MsgBox(w->Shaper(), w->Father(), "About...", - "Dalos version 0.1 - OpenGL version\n" - "Copyright (C) 2004 Nicolas \"Pixel\" Noble\n" - "\n" - "Thanks and greetings fly to (no particular order)\n" - "GreatSkaori, Orphis, Ti Dragon, Yaz0r, S-O-R,\n" - "Meradrin, SkeuD, Moogle, InVerse, LavosSpawn\n" - "\n" - "And to all I forgot!\n" - ); - } -} about_dialog; - -virtual int startup() throw (GeneralException) { - verbosity = M_INFO; - try { - new Archive(argv[0], ARCHIVE_EXECUTABLE); - } - catch (...) { - new Archive("Dalos.paq"); - } - - mogltk::widgets::ContextMenu * c; - mogltk::base * gl = new mogltk::glbase(); - mogltk::shape * sh = new mogltk::glshape(); - - SDL_EnableKeyRepeat(250, 40); - - mogltk::engine::setcursorvisible(true); - mogltk::engine::setappactive(true); - - Root = new mogltk::widgets::Root(sh); - MainPanel = Root->InnerPanel(); - MainMenu = new mogltk::widgets::Menu(sh, MainPanel); - Frame = new frame(sh, new mogltk::widgets::Frame(sh, MainPanel, 0, MainMenu->GetH(), Root->GetW() - 1, Root->GetH() - MainMenu->GetH() - 1)); - - mogltk::widget * box = new mogltk::widgets::SmartBox(sh, MainPanel, 50, 50, 500, 400, "Hexview"); - (new hexview(sh, box->InnerPanel()))->bind_handle(new Input(argv[0])); - - CurrentConsole = new console(sh, Root, 0, 8); - console::create_console_thread(); - CurrentConsole->move(0, Root->GetH() - CurrentConsole->GetH()); - CurrentConsole->add_line("Dalos v0.1 - LUA console - Press ESC to show/hide it."); - CurrentConsole->SetVisible(true); - - printer = new myprinter(); - locker = new threaded_locker(); - - start_lua(); - - // Filling menu. - MainMenu->addnode("/", 0); - - c = MainMenu->createsub("File"); - c->addnode("Quit", &action_quit); - - c = MainMenu->createsub("Help"); - c->addnode("About", &about_dialog); - - MainMenu->addnode("FPS:", 0); - - new timer(); - - // Setting up the key event handlers - new hexview::hexview_keyevent; - new console::console_keyevent; // Should be one of the last - - // And launching the main loop - Root->mainloop(); - - // Should cleanup here... nevermind ;) - - return 0; -} - -CODE_ENDS +/* + * Dalos + * Copyright (C) 2003-2005 Nicolas "Pixel" Noble + * + * 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 + */ + +/* $Id: Dalos.cc,v 1.15 2005-02-24 11:30:04 pixel Exp $ */ + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include "cd-tool-hc.h" + +#ifdef __MINGW32__ +#define main SDL_main +#endif + + +// all these global variables are ugly... +bool auto_exec = true; +bool lua_started = false; +bool do_lua_break = false; + +CODE_BEGINS + +mogltk::widgets::Root * Root; +mogltk::widget * Frame, * MainPanel; +mogltk::widgets::Menu * MainMenu; + +class threaded_Lua : public Lua { + public: + threaded_Lua() : mutex(SDL_CreateMutex()) { } + virtual ~threaded_Lua() { SDL_DestroyMutex(mutex); } + virtual void lock() { + SDL_mutexP(mutex); + } + virtual void unlock() { + SDL_mutexV(mutex); + } + private: + SDL_mutex * mutex; +}; + +class threaded_locker : public locker_t { + public: + threaded_locker() : mutex(SDL_CreateMutex()) { } + virtual ~threaded_locker() { SDL_DestroyMutex(mutex); } + virtual void lock() { + SDL_mutexP(mutex); + } + virtual void unlock() { + SDL_mutexV(mutex); + } + private: + SDL_mutex * mutex; +}; + +static int lua_print(lua_State * _L) { + Lua * L = Lua::find(_L); + String t = L->tostring() + "\n"; + char * tc = t.strdup(); + + printm(M_STATUS, "%s", tc); + + free(tc); + + return 0; +} + +static void lua_hook(lua_State * _L, lua_Debug * ar) { + if (!lua_started) + return; + Lua * L = Lua::find(_L); + + if (do_lua_break) { + L->do_break(); + do_lua_break = false; + } +} + +void start_lua() { + Lua * L = new threaded_Lua(); + bool use_builtin_cdtool = false; + int i; + + L->open_base(); + L->open_math(); + L->open_string(); + L->open_table(); + + LuaInput::pushconstruct(L); + LuaOutput::pushconstruct(L); + LuaBuffer::pushconstruct(L); + + CD_PUSHSTATICS(L); + Luapsx::pushstatics(L); + + L->push("print"); + L->push(lua_print); + L->setvar(); + + L->sethook(lua_hook, LUA_MASKLINE, 0); + + console_lock = SDL_CreateMutex(); + console_sem = SDL_CreateSemaphore(0); + + try { + L->load(&Input("cd-tool.lua")); + } catch (GeneralException e) { + printm(M_WARNING, "There was an error loading cd-tool.lua: %s, using built-in.\n", e.GetMsg()); + use_builtin_cdtool = true; + } + + if (use_builtin_cdtool) { + Buffer built; + built.write(cd_tool_lua, cd_tool_lua_size); + try { + L->load(&built); + } + catch (GeneralException e) { + printm(M_WARNING, "There was an error loading built-in cd-tool.lua: %s\n", e.GetMsg()); + } + } + + SDL_CreateThread(LuaThread, L); +} + +static int LuaThread(void * d) { + Lua * L = (Lua *) d; + while (true) { + SDL_SemWait(console_sem); + lua_started = true; + SDL_mutexP(console_lock); + try { + L->load(&console_buffer); + } + catch (LuaException e) { + /* If there was an error, ignore it, and free the stack */ + while(L->gettop()) + L->pop(); + } + catch (GeneralException e) { + /* A more severe exception... */ + while(L->gettop()) + L->pop(); + printm(M_ERROR, "Aborted. LUA caused the following exception: %s\n", e.GetMsg()); + } + SDL_mutexV(console_lock); + lua_started = false; + } +} + +class myprinter : public printer_t { + public: + myprinter() : lock(SDL_CreateMutex()) { } + virtual ~myprinter() { SDL_DestroyMutex(lock); } + virtual bool printm(int level, const char * m, va_list ap) { + static String heads[] = {"EE", "--", "WW", "II"}; + static char buffer[20480]; + + if (level >= M_INFO) + return true; + + SDL_mutexP(lock); + + vsnprintf(buffer, 20479, m, ap); + if (level >= 0) + CurrentConsole->add_line("(" + heads[level] + ") " + buffer); + else + CurrentConsole->add_line(buffer); + + SDL_mutexV(lock); + + return true; + } + private: + SDL_mutex * lock; +}; + +class frame : public mogltk::widget { + public: + frame(mogltk::shape * sh, mogltk::widget * father) : + widget(father, 2, 2, father->GetW() - 4, father->GetH() - 4, 0, "MyFrame", sh) { } + protected: + virtual void draw() { + } + virtual mogltk::rect GetDrawRect() { + mogltk::rect r; + + r.x = GetX() + 2; + r.y = GetY() + 2; + r.w = GetW() - 4; + r.h = GetH() - 4; + + return r; + } + virtual bool process_event(int mx, int my, mogltk::event_t event) { + mx -= GetAX(); + my -= GetAY(); + return false; + } + virtual void resize_notify() { + resize(Father()->GetW() - 4, Father()->GetH() - 4); + } +}; + +class timer : public mogltk::widget { + public: + timer() : + widget(Application->Root, 0, 0, 0, 0, 0, "Timer", 0), tick(0) + { set_timed_event(100); } + protected: + virtual bool process_event(int, int, mogltk::event_t event) { + if (event == mogltk::E_TIMER) { + set_timed_event(100); + tick = (tick + 1) % 4; + switch (tick) { + case 0: + Application->MainMenu->SetCaption(0, "/"); + break; + case 1: + Application->MainMenu->SetCaption(0, "-"); + break; + case 2: + Application->MainMenu->SetCaption(0, "\\"); + break; + case 3: + Application->MainMenu->SetCaption(0, "I"); + break; + } + Application->MainMenu->SetCaption(3, String("FPS: ") + mogltk::engine::FPS()); + return true; + } + return false; + } + private: + int tick; +}; + +class quit : public mogltk::widgets::action { + public: + virtual void do_action(mogltk::widget * w) { + mogltk::engine::quit(); + } +} action_quit; + +class about : public mogltk::widgets::action { + public: + virtual void do_action(mogltk::widget * w) { + new mogltk::widgets::MsgBox(w->Shaper(), w->Father(), "About...", + "Dalos version 0.1 - OpenGL version\n" + "Copyright (C) 2004 Nicolas \"Pixel\" Noble\n" + "\n" + "Thanks and greetings fly to (no particular order)\n" + "GreatSkaori, Orphis, Ti Dragon, Yaz0r, S-O-R,\n" + "Meradrin, SkeuD, Moogle, InVerse, LavosSpawn\n" + "\n" + "And to all I forgot!\n" + ); + } +} about_dialog; + +virtual int startup() throw (GeneralException) { + verbosity = M_INFO; + try { + new Archive(argv[0], ARCHIVE_EXECUTABLE); + } + catch (...) { + new Archive("Dalos.paq"); + } + + mogltk::widgets::ContextMenu * c; + mogltk::base * gl = new mogltk::glbase(); + mogltk::shape * sh = new mogltk::glshape(); + + SDL_EnableKeyRepeat(250, 40); + + mogltk::engine::setcursorvisible(true); + mogltk::engine::setappactive(true); + + Root = new mogltk::widgets::Root(sh); + MainPanel = Root->InnerPanel(); + MainMenu = new mogltk::widgets::Menu(sh, MainPanel); + Frame = new frame(sh, new mogltk::widgets::Frame(sh, MainPanel, 0, MainMenu->GetH(), Root->GetW() - 1, Root->GetH() - MainMenu->GetH() - 1)); + + mogltk::widget * box = new mogltk::widgets::SmartBox(sh, MainPanel, 50, 50, 500, 400, "Hexview"); + (new hexview(sh, box->InnerPanel()))->bind_handle(new Input(argv[0])); + + CurrentConsole = new console(sh, Root, 0, 8); + console::create_console_thread(); + CurrentConsole->move(0, Root->GetH() - CurrentConsole->GetH()); + CurrentConsole->add_line("Dalos v0.1 - LUA console - Press ESC to show/hide it."); + CurrentConsole->SetVisible(true); + + printer = new myprinter(); + locker = new threaded_locker(); + + start_lua(); + + // Filling menu. + MainMenu->addnode("/", 0); + + c = MainMenu->createsub("File"); + c->addnode("Quit", &action_quit); + + c = MainMenu->createsub("Help"); + c->addnode("About", &about_dialog); + + MainMenu->addnode("FPS:", 0); + + new timer(); + + // Setting up the key event handlers + new hexview::hexview_keyevent; + new console::console_keyevent; // Should be one of the last + + // And launching the main loop + Root->mainloop(); + + // Should cleanup here... nevermind ;) + + return 0; +} + +CODE_ENDS diff --git a/Dalos/Hexview.cc b/Dalos/Hexview.cc index 0b3fc28..0519526 100644 --- a/Dalos/Hexview.cc +++ b/Dalos/Hexview.cc @@ -1,200 +1,200 @@ -/* - * Dalos - * Copyright (C) 2003-2005 Nicolas "Pixel" Noble - * - * 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 - */ - -/* $Id: Hexview.cc,v 1.1 2004-12-26 03:29:10 pixel Exp $ */ - -#include - -#include - -#include "Hexview.h" - -void hexview::hexview_keyevent::down(SDL_keysym k) { - if (!CurrentHexview || !CurrentHexview->GetVisible()) { - if (old_handler) - old_handler->down(k); - return; - } - switch (k.sym) { - case SDLK_DOWN: - CurrentHexview->change_offset(CurrentHexview->get_offset() + CurrentHexview->get_width()); - break; - case SDLK_UP: - CurrentHexview->change_offset(CurrentHexview->get_offset() - CurrentHexview->get_width()); - break; - case SDLK_RIGHT: - if (KMOD_ALT & k.mod) { - CurrentHexview->change_width(CurrentHexview->get_width() + 1); - } else if (KMOD_CTRL & k.mod) { - CurrentHexview->change_shift(CurrentHexview->get_shift() - 1); - } else { - CurrentHexview->change_offset(CurrentHexview->get_offset() + 1); - } - break; - case SDLK_LEFT: - if (KMOD_ALT & k.mod) { - CurrentHexview->change_width(CurrentHexview->get_width() - 1); - } else if (KMOD_CTRL & k.mod) { - CurrentHexview->change_shift(CurrentHexview->get_shift() + 1); - } else { - CurrentHexview->change_offset(CurrentHexview->get_offset() - 1); - } - break; - case SDLK_PAGEDOWN: - CurrentHexview->change_offset(CurrentHexview->get_offset() + CurrentHexview->get_width() * CurrentHexview->get_nlines()); - break; - case SDLK_PAGEUP: - CurrentHexview->change_offset(CurrentHexview->get_offset() - CurrentHexview->get_width() * CurrentHexview->get_nlines()); - break; - case SDLK_HOME: - CurrentHexview->change_offset(0); - break; - case SDLK_END: - CurrentHexview->change_offset(CurrentHexview->get_size() - 1); - break; - default: - if (old_handler) - old_handler->down(k); - return; - } -} - -void hexview::hexview_keyevent::up(SDL_keysym k) { - if (old_handler) - old_handler->up(k); -} - -hexview::hexview(mogltk::shape * sh, mogltk::widget * father) : - widget(father, 0, 0, father->GetW(), father->GetH(), 0, "hexview", sh), h(0), width(16), offset(0), offset_loaded(-1), size_loaded(0), data(0), virtual_base(0), shift(0) -{ - nlines = GetH() / 13; CurrentHexview = this; -} - -hexview::~hexview() { - free(data); - CurrentHexview = 0; -} - -void hexview::set_virtual_base(int _virtual_base) { - virtual_base = _virtual_base; -} - -int hexview::get_nlines() { - return nlines; -} - -int hexview::get_size() { - if (!h) - return 0; - return h->GetSize(); -} - -void hexview::change_width(int _width) { - if (_width <= 0) - _width = 1; - if (width != _width) { - free(data); - width = _width; - } -} - -int hexview::get_width() { - return width; -} - -void hexview::change_offset(int _offset) { - if ((_offset < 0) || !h) - _offset = 0; - if (h && (_offset >= h->GetSize())) - _offset = h->GetSize() - 1; - offset = _offset; -} - -int hexview::get_offset() { - return offset; -} - -void hexview::change_shift(int _shift) { - if (_shift < 0) - _shift = 0; - shift = _shift; -} - -int hexview::get_shift() { - return shift; -} - -void hexview::bind_handle(Handle * _h) { - h = _h; -} - -Uint8 * hexview::get_data() { - if (!data) { - data = (Uint8 *) malloc(nlines * width); - } - - if ((offset_loaded == offset) && (size_loaded == (nlines * width))) - return data; - - h->seek(offset); - h->read(data, nlines * width); - - offset_loaded = offset; - size_loaded = nlines * width; - - return data; -} - -void hexview::draw() { - int i, max_o, j, k, start_o, l, c; - - if (!h) - return; - - get_data(); - - mogltk::FixedFont->setcolor(WHITE); - mogltk::FixedFont->putcursor(GetAX() - shift * 6, GetAY()); - - max_o = min(h->GetSize(), offset + nlines * width); - - for (i = start_o = offset, j = 0, l = 0; i < max_o; i++) { - if ((j % width) == 0) { - mogltk::FixedFont->printf("%08X ", i + virtual_base); - } - mogltk::FixedFont->printf("%02X ", data[j]); - j++; - if ((j % width) == 0) { - for (k = start_o, c = 0; k < start_o + width; k++, c++) { - mogltk::FixedFont->putcursor(GetAX() + (c + width * 3 + 14 - shift) * 6, GetAY() + l * 13); - if (data[j - width + c] >= 0x20) - // Have better font support here... - mogltk::FixedFont->putentry(data[j - width + c] - 0x20); - } - l++; - mogltk::FixedFont->putcursor(GetAX() - shift * 6, GetAY() + l * 13); - start_o = i; - } - } -} - -void hexview::resize_notify() { - nlines = Father()->GetH() / 13; - resize(Father()->GetW(), Father()->GetH()); -} +/* + * Dalos + * Copyright (C) 2003-2005 Nicolas "Pixel" Noble + * + * 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 + */ + +/* $Id: Hexview.cc,v 1.2 2005-02-24 11:30:04 pixel Exp $ */ + +#include + +#include + +#include "Hexview.h" + +void hexview::hexview_keyevent::down(SDL_keysym k) { + if (!CurrentHexview || !CurrentHexview->GetVisible()) { + if (old_handler) + old_handler->down(k); + return; + } + switch (k.sym) { + case SDLK_DOWN: + CurrentHexview->change_offset(CurrentHexview->get_offset() + CurrentHexview->get_width()); + break; + case SDLK_UP: + CurrentHexview->change_offset(CurrentHexview->get_offset() - CurrentHexview->get_width()); + break; + case SDLK_RIGHT: + if (KMOD_ALT & k.mod) { + CurrentHexview->change_width(CurrentHexview->get_width() + 1); + } else if (KMOD_CTRL & k.mod) { + CurrentHexview->change_shift(CurrentHexview->get_shift() - 1); + } else { + CurrentHexview->change_offset(CurrentHexview->get_offset() + 1); + } + break; + case SDLK_LEFT: + if (KMOD_ALT & k.mod) { + CurrentHexview->change_width(CurrentHexview->get_width() - 1); + } else if (KMOD_CTRL & k.mod) { + CurrentHexview->change_shift(CurrentHexview->get_shift() + 1); + } else { + CurrentHexview->change_offset(CurrentHexview->get_offset() - 1); + } + break; + case SDLK_PAGEDOWN: + CurrentHexview->change_offset(CurrentHexview->get_offset() + CurrentHexview->get_width() * CurrentHexview->get_nlines()); + break; + case SDLK_PAGEUP: + CurrentHexview->change_offset(CurrentHexview->get_offset() - CurrentHexview->get_width() * CurrentHexview->get_nlines()); + break; + case SDLK_HOME: + CurrentHexview->change_offset(0); + break; + case SDLK_END: + CurrentHexview->change_offset(CurrentHexview->get_size() - 1); + break; + default: + if (old_handler) + old_handler->down(k); + return; + } +} + +void hexview::hexview_keyevent::up(SDL_keysym k) { + if (old_handler) + old_handler->up(k); +} + +hexview::hexview(mogltk::shape * sh, mogltk::widget * father) : + widget(father, 0, 0, father->GetW(), father->GetH(), 0, "hexview", sh), h(0), width(16), offset(0), offset_loaded(-1), size_loaded(0), data(0), virtual_base(0), shift(0) +{ + nlines = GetH() / 13; CurrentHexview = this; +} + +hexview::~hexview() { + free(data); + CurrentHexview = 0; +} + +void hexview::set_virtual_base(int _virtual_base) { + virtual_base = _virtual_base; +} + +int hexview::get_nlines() { + return nlines; +} + +int hexview::get_size() { + if (!h) + return 0; + return h->GetSize(); +} + +void hexview::change_width(int _width) { + if (_width <= 0) + _width = 1; + if (width != _width) { + free(data); + width = _width; + } +} + +int hexview::get_width() { + return width; +} + +void hexview::change_offset(int _offset) { + if ((_offset < 0) || !h) + _offset = 0; + if (h && (_offset >= h->GetSize())) + _offset = h->GetSize() - 1; + offset = _offset; +} + +int hexview::get_offset() { + return offset; +} + +void hexview::change_shift(int _shift) { + if (_shift < 0) + _shift = 0; + shift = _shift; +} + +int hexview::get_shift() { + return shift; +} + +void hexview::bind_handle(Handle * _h) { + h = _h; +} + +Uint8 * hexview::get_data() { + if (!data) { + data = (Uint8 *) malloc(nlines * width); + } + + if ((offset_loaded == offset) && (size_loaded == (nlines * width))) + return data; + + h->seek(offset); + h->read(data, nlines * width); + + offset_loaded = offset; + size_loaded = nlines * width; + + return data; +} + +void hexview::draw() { + int i, max_o, j, k, start_o, l, c; + + if (!h) + return; + + get_data(); + + mogltk::FixedFont->setcolor(WHITE); + mogltk::FixedFont->putcursor(GetAX() - shift * 6, GetAY()); + + max_o = min(h->GetSize(), offset + nlines * width); + + for (i = start_o = offset, j = 0, l = 0; i < max_o; i++) { + if ((j % width) == 0) { + mogltk::FixedFont->printf("%08X ", i + virtual_base); + } + mogltk::FixedFont->printf("%02X ", data[j]); + j++; + if ((j % width) == 0) { + for (k = start_o, c = 0; k < start_o + width; k++, c++) { + mogltk::FixedFont->putcursor(GetAX() + (c + width * 3 + 14 - shift) * 6, GetAY() + l * 13); + if (data[j - width + c] >= 0x20) + // Have better font support here... + mogltk::FixedFont->putentry(data[j - width + c] - 0x20); + } + l++; + mogltk::FixedFont->putcursor(GetAX() - shift * 6, GetAY() + l * 13); + start_o = i; + } + } +} + +void hexview::resize_notify() { + nlines = Father()->GetH() / 13; + resize(Father()->GetW(), Father()->GetH()); +} diff --git a/MSVC/Dalos/Dalos.vcproj b/MSVC/Dalos/Dalos.vcproj index 8cfc241..35a97ed 100644 --- a/MSVC/Dalos/Dalos.vcproj +++ b/MSVC/Dalos/Dalos.vcproj @@ -1,203 +1,203 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj index 0a749d6..1015075 100644 --- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj +++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj @@ -1,304 +1,314 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC/mogltk/mogltk.vcproj b/MSVC/mogltk/mogltk.vcproj index c0ef368..c47be28 100644 --- a/MSVC/mogltk/mogltk.vcproj +++ b/MSVC/mogltk/mogltk.vcproj @@ -1,288 +1,290 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/crctable.out b/lib/crctable.out index f70577e..34adfe1 100644 --- a/lib/crctable.out +++ b/lib/crctable.out @@ -1,91 +1,91 @@ -/*****************************************************************/ -/* */ -/* CRC LOOKUP TABLE */ -/* ================ */ -/* The following CRC lookup table was generated automagically */ -/* by the Rocksoft^tm Model CRC Algorithm Table Generation */ -/* Program V1.0 using the following model parameters: */ -/* */ -/* Width : 4 bytes. */ -/* Poly : 0x8001801BL */ -/* Reverse : TRUE. */ -/* */ -/* For more information on the Rocksoft^tm Model CRC Algorithm, */ -/* see the document titled "A Painless Guide to CRC Error */ -/* Detection Algorithms" by Ross Williams */ -/* (ross@guest.adelaide.edu.au.). This document is likely to be */ -/* in the FTP archive "ftp.adelaide.edu.au/pub/rocksoft". */ -/* */ -/*****************************************************************/ - -const unsigned long EDC_crctable[256] = -{ - 0x00000000L, 0x90910101L, 0x91210201L, 0x01B00300L, - 0x92410401L, 0x02D00500L, 0x03600600L, 0x93F10701L, - 0x94810801L, 0x04100900L, 0x05A00A00L, 0x95310B01L, - 0x06C00C00L, 0x96510D01L, 0x97E10E01L, 0x07700F00L, - 0x99011001L, 0x09901100L, 0x08201200L, 0x98B11301L, - 0x0B401400L, 0x9BD11501L, 0x9A611601L, 0x0AF01700L, - 0x0D801800L, 0x9D111901L, 0x9CA11A01L, 0x0C301B00L, - 0x9FC11C01L, 0x0F501D00L, 0x0EE01E00L, 0x9E711F01L, - 0x82012001L, 0x12902100L, 0x13202200L, 0x83B12301L, - 0x10402400L, 0x80D12501L, 0x81612601L, 0x11F02700L, - 0x16802800L, 0x86112901L, 0x87A12A01L, 0x17302B00L, - 0x84C12C01L, 0x14502D00L, 0x15E02E00L, 0x85712F01L, - 0x1B003000L, 0x8B913101L, 0x8A213201L, 0x1AB03300L, - 0x89413401L, 0x19D03500L, 0x18603600L, 0x88F13701L, - 0x8F813801L, 0x1F103900L, 0x1EA03A00L, 0x8E313B01L, - 0x1DC03C00L, 0x8D513D01L, 0x8CE13E01L, 0x1C703F00L, - 0xB4014001L, 0x24904100L, 0x25204200L, 0xB5B14301L, - 0x26404400L, 0xB6D14501L, 0xB7614601L, 0x27F04700L, - 0x20804800L, 0xB0114901L, 0xB1A14A01L, 0x21304B00L, - 0xB2C14C01L, 0x22504D00L, 0x23E04E00L, 0xB3714F01L, - 0x2D005000L, 0xBD915101L, 0xBC215201L, 0x2CB05300L, - 0xBF415401L, 0x2FD05500L, 0x2E605600L, 0xBEF15701L, - 0xB9815801L, 0x29105900L, 0x28A05A00L, 0xB8315B01L, - 0x2BC05C00L, 0xBB515D01L, 0xBAE15E01L, 0x2A705F00L, - 0x36006000L, 0xA6916101L, 0xA7216201L, 0x37B06300L, - 0xA4416401L, 0x34D06500L, 0x35606600L, 0xA5F16701L, - 0xA2816801L, 0x32106900L, 0x33A06A00L, 0xA3316B01L, - 0x30C06C00L, 0xA0516D01L, 0xA1E16E01L, 0x31706F00L, - 0xAF017001L, 0x3F907100L, 0x3E207200L, 0xAEB17301L, - 0x3D407400L, 0xADD17501L, 0xAC617601L, 0x3CF07700L, - 0x3B807800L, 0xAB117901L, 0xAAA17A01L, 0x3A307B00L, - 0xA9C17C01L, 0x39507D00L, 0x38E07E00L, 0xA8717F01L, - 0xD8018001L, 0x48908100L, 0x49208200L, 0xD9B18301L, - 0x4A408400L, 0xDAD18501L, 0xDB618601L, 0x4BF08700L, - 0x4C808800L, 0xDC118901L, 0xDDA18A01L, 0x4D308B00L, - 0xDEC18C01L, 0x4E508D00L, 0x4FE08E00L, 0xDF718F01L, - 0x41009000L, 0xD1919101L, 0xD0219201L, 0x40B09300L, - 0xD3419401L, 0x43D09500L, 0x42609600L, 0xD2F19701L, - 0xD5819801L, 0x45109900L, 0x44A09A00L, 0xD4319B01L, - 0x47C09C00L, 0xD7519D01L, 0xD6E19E01L, 0x46709F00L, - 0x5A00A000L, 0xCA91A101L, 0xCB21A201L, 0x5BB0A300L, - 0xC841A401L, 0x58D0A500L, 0x5960A600L, 0xC9F1A701L, - 0xCE81A801L, 0x5E10A900L, 0x5FA0AA00L, 0xCF31AB01L, - 0x5CC0AC00L, 0xCC51AD01L, 0xCDE1AE01L, 0x5D70AF00L, - 0xC301B001L, 0x5390B100L, 0x5220B200L, 0xC2B1B301L, - 0x5140B400L, 0xC1D1B501L, 0xC061B601L, 0x50F0B700L, - 0x5780B800L, 0xC711B901L, 0xC6A1BA01L, 0x5630BB00L, - 0xC5C1BC01L, 0x5550BD00L, 0x54E0BE00L, 0xC471BF01L, - 0x6C00C000L, 0xFC91C101L, 0xFD21C201L, 0x6DB0C300L, - 0xFE41C401L, 0x6ED0C500L, 0x6F60C600L, 0xFFF1C701L, - 0xF881C801L, 0x6810C900L, 0x69A0CA00L, 0xF931CB01L, - 0x6AC0CC00L, 0xFA51CD01L, 0xFBE1CE01L, 0x6B70CF00L, - 0xF501D001L, 0x6590D100L, 0x6420D200L, 0xF4B1D301L, - 0x6740D400L, 0xF7D1D501L, 0xF661D601L, 0x66F0D700L, - 0x6180D800L, 0xF111D901L, 0xF0A1DA01L, 0x6030DB00L, - 0xF3C1DC01L, 0x6350DD00L, 0x62E0DE00L, 0xF271DF01L, - 0xEE01E001L, 0x7E90E100L, 0x7F20E200L, 0xEFB1E301L, - 0x7C40E400L, 0xECD1E501L, 0xED61E601L, 0x7DF0E700L, - 0x7A80E800L, 0xEA11E901L, 0xEBA1EA01L, 0x7B30EB00L, - 0xE8C1EC01L, 0x7850ED00L, 0x79E0EE00L, 0xE971EF01L, - 0x7700F000L, 0xE791F101L, 0xE621F201L, 0x76B0F300L, - 0xE541F401L, 0x75D0F500L, 0x7460F600L, 0xE4F1F701L, - 0xE381F801L, 0x7310F900L, 0x72A0FA00L, 0xE231FB01L, - 0x71C0FC00L, 0xE151FD01L, 0xE0E1FE01L, 0x7070FF00L -}; - -/*****************************************************************/ -/* End of CRC Lookup Table */ -/*****************************************************************/ +/*****************************************************************/ +/* */ +/* CRC LOOKUP TABLE */ +/* ================ */ +/* The following CRC lookup table was generated automagically */ +/* by the Rocksoft^tm Model CRC Algorithm Table Generation */ +/* Program V1.0 using the following model parameters: */ +/* */ +/* Width : 4 bytes. */ +/* Poly : 0x8001801BL */ +/* Reverse : TRUE. */ +/* */ +/* For more information on the Rocksoft^tm Model CRC Algorithm, */ +/* see the document titled "A Painless Guide to CRC Error */ +/* Detection Algorithms" by Ross Williams */ +/* (ross@guest.adelaide.edu.au.). This document is likely to be */ +/* in the FTP archive "ftp.adelaide.edu.au/pub/rocksoft". */ +/* */ +/*****************************************************************/ + +const unsigned long EDC_crctable[256] = +{ + 0x00000000L, 0x90910101L, 0x91210201L, 0x01B00300L, + 0x92410401L, 0x02D00500L, 0x03600600L, 0x93F10701L, + 0x94810801L, 0x04100900L, 0x05A00A00L, 0x95310B01L, + 0x06C00C00L, 0x96510D01L, 0x97E10E01L, 0x07700F00L, + 0x99011001L, 0x09901100L, 0x08201200L, 0x98B11301L, + 0x0B401400L, 0x9BD11501L, 0x9A611601L, 0x0AF01700L, + 0x0D801800L, 0x9D111901L, 0x9CA11A01L, 0x0C301B00L, + 0x9FC11C01L, 0x0F501D00L, 0x0EE01E00L, 0x9E711F01L, + 0x82012001L, 0x12902100L, 0x13202200L, 0x83B12301L, + 0x10402400L, 0x80D12501L, 0x81612601L, 0x11F02700L, + 0x16802800L, 0x86112901L, 0x87A12A01L, 0x17302B00L, + 0x84C12C01L, 0x14502D00L, 0x15E02E00L, 0x85712F01L, + 0x1B003000L, 0x8B913101L, 0x8A213201L, 0x1AB03300L, + 0x89413401L, 0x19D03500L, 0x18603600L, 0x88F13701L, + 0x8F813801L, 0x1F103900L, 0x1EA03A00L, 0x8E313B01L, + 0x1DC03C00L, 0x8D513D01L, 0x8CE13E01L, 0x1C703F00L, + 0xB4014001L, 0x24904100L, 0x25204200L, 0xB5B14301L, + 0x26404400L, 0xB6D14501L, 0xB7614601L, 0x27F04700L, + 0x20804800L, 0xB0114901L, 0xB1A14A01L, 0x21304B00L, + 0xB2C14C01L, 0x22504D00L, 0x23E04E00L, 0xB3714F01L, + 0x2D005000L, 0xBD915101L, 0xBC215201L, 0x2CB05300L, + 0xBF415401L, 0x2FD05500L, 0x2E605600L, 0xBEF15701L, + 0xB9815801L, 0x29105900L, 0x28A05A00L, 0xB8315B01L, + 0x2BC05C00L, 0xBB515D01L, 0xBAE15E01L, 0x2A705F00L, + 0x36006000L, 0xA6916101L, 0xA7216201L, 0x37B06300L, + 0xA4416401L, 0x34D06500L, 0x35606600L, 0xA5F16701L, + 0xA2816801L, 0x32106900L, 0x33A06A00L, 0xA3316B01L, + 0x30C06C00L, 0xA0516D01L, 0xA1E16E01L, 0x31706F00L, + 0xAF017001L, 0x3F907100L, 0x3E207200L, 0xAEB17301L, + 0x3D407400L, 0xADD17501L, 0xAC617601L, 0x3CF07700L, + 0x3B807800L, 0xAB117901L, 0xAAA17A01L, 0x3A307B00L, + 0xA9C17C01L, 0x39507D00L, 0x38E07E00L, 0xA8717F01L, + 0xD8018001L, 0x48908100L, 0x49208200L, 0xD9B18301L, + 0x4A408400L, 0xDAD18501L, 0xDB618601L, 0x4BF08700L, + 0x4C808800L, 0xDC118901L, 0xDDA18A01L, 0x4D308B00L, + 0xDEC18C01L, 0x4E508D00L, 0x4FE08E00L, 0xDF718F01L, + 0x41009000L, 0xD1919101L, 0xD0219201L, 0x40B09300L, + 0xD3419401L, 0x43D09500L, 0x42609600L, 0xD2F19701L, + 0xD5819801L, 0x45109900L, 0x44A09A00L, 0xD4319B01L, + 0x47C09C00L, 0xD7519D01L, 0xD6E19E01L, 0x46709F00L, + 0x5A00A000L, 0xCA91A101L, 0xCB21A201L, 0x5BB0A300L, + 0xC841A401L, 0x58D0A500L, 0x5960A600L, 0xC9F1A701L, + 0xCE81A801L, 0x5E10A900L, 0x5FA0AA00L, 0xCF31AB01L, + 0x5CC0AC00L, 0xCC51AD01L, 0xCDE1AE01L, 0x5D70AF00L, + 0xC301B001L, 0x5390B100L, 0x5220B200L, 0xC2B1B301L, + 0x5140B400L, 0xC1D1B501L, 0xC061B601L, 0x50F0B700L, + 0x5780B800L, 0xC711B901L, 0xC6A1BA01L, 0x5630BB00L, + 0xC5C1BC01L, 0x5550BD00L, 0x54E0BE00L, 0xC471BF01L, + 0x6C00C000L, 0xFC91C101L, 0xFD21C201L, 0x6DB0C300L, + 0xFE41C401L, 0x6ED0C500L, 0x6F60C600L, 0xFFF1C701L, + 0xF881C801L, 0x6810C900L, 0x69A0CA00L, 0xF931CB01L, + 0x6AC0CC00L, 0xFA51CD01L, 0xFBE1CE01L, 0x6B70CF00L, + 0xF501D001L, 0x6590D100L, 0x6420D200L, 0xF4B1D301L, + 0x6740D400L, 0xF7D1D501L, 0xF661D601L, 0x66F0D700L, + 0x6180D800L, 0xF111D901L, 0xF0A1DA01L, 0x6030DB00L, + 0xF3C1DC01L, 0x6350DD00L, 0x62E0DE00L, 0xF271DF01L, + 0xEE01E001L, 0x7E90E100L, 0x7F20E200L, 0xEFB1E301L, + 0x7C40E400L, 0xECD1E501L, 0xED61E601L, 0x7DF0E700L, + 0x7A80E800L, 0xEA11E901L, 0xEBA1EA01L, 0x7B30EB00L, + 0xE8C1EC01L, 0x7850ED00L, 0x79E0EE00L, 0xE971EF01L, + 0x7700F000L, 0xE791F101L, 0xE621F201L, 0x76B0F300L, + 0xE541F401L, 0x75D0F500L, 0x7460F600L, 0xE4F1F701L, + 0xE381F801L, 0x7310F900L, 0x72A0FA00L, 0xE231FB01L, + 0x71C0FC00L, 0xE151FD01L, 0xE0E1FE01L, 0x7070FF00L +}; + +/*****************************************************************/ +/* End of CRC Lookup Table */ +/*****************************************************************/ diff --git a/lib/crctables b/lib/crctables index 0f2a0a3..436f211 100644 --- a/lib/crctables +++ b/lib/crctables @@ -1,120 +1,120 @@ -const static unsigned char rs_l12_alog[255] = { - 1, 2, 4, 8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143, 3, 6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140, 5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141, 7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138, 9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,}; +const static unsigned char rs_l12_alog[255] = { + 1, 2, 4, 8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143, 3, 6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140, 5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141, 7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138, 9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,}; -const static unsigned char rs_l12_log[256] = { - 0, 0, 1,25, 2,50,26,198, 3,223,51,238,27,104,199,75, 4,100,224,14,52,141,239,129,28,193,105,248,200, 8,76,113, 5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154, 9,120,77,228,114,166, 6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87, 7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175,}; +const static unsigned char rs_l12_log[256] = { + 0, 0, 1,25, 2,50,26,198, 3,223,51,238,27,104,199,75, 4,100,224,14,52,141,239,129,28,193,105,248,200, 8,76,113, 5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154, 9,120,77,228,114,166, 6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87, 7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175,}; -const static unsigned char DQ[2][43] = { -{190,96,250,132,59,81,159,154,200,7,111,245,10,20,41,156,168,79,173,231,229,171,210,240,17,67,215,43,120,8,199,74,102,220,251,95,175,87,166,113,75,198,25,}, -{97,251,133,60,82,160,155,201,8,112,246,11,21,42,157,169,80,174,232,230,172,211,241,18,68,216,44,121,9,200,75,103,221,252,96,176,88,167,114,76,199,26,1,}, -}; +const static unsigned char DQ[2][43] = { +{190,96,250,132,59,81,159,154,200,7,111,245,10,20,41,156,168,79,173,231,229,171,210,240,17,67,215,43,120,8,199,74,102,220,251,95,175,87,166,113,75,198,25,}, +{97,251,133,60,82,160,155,201,8,112,246,11,21,42,157,169,80,174,232,230,172,211,241,18,68,216,44,121,9,200,75,103,221,252,96,176,88,167,114,76,199,26,1,}, +}; -const static unsigned char DP[2][24] = { -{231,229,171,210,240,17,67,215,43,120,8,199,74,102,220,251,95,175,87,166,113,75,198,25,}, -{230,172,211,241,18,68,216,44,121,9,200,75,103,221,252,96,176,88,167,114,76,199,26,1,}, -}; +const static unsigned char DP[2][24] = { +{231,229,171,210,240,17,67,215,43,120,8,199,74,102,220,251,95,175,87,166,113,75,198,25,}, +{230,172,211,241,18,68,216,44,121,9,200,75,103,221,252,96,176,88,167,114,76,199,26,1,}, +}; -const static unsigned char yellowbook_scrambler[2340] = { - 1,128,0,96,0,40,0,30,128,8,96,6,168,2,254,129,128,96,96,40,40,30,158, - 136,104,102,174,170,252,127,1,224,0,72,0,54,128,22,224,14,200,4,86,131,126,225, - 224,72,72,54,182,150,246,238,198,204,82,213,253,159,1,168,0,126,128,32,96,24,40, - 10,158,135,40,98,158,169,168,126,254,160,64,120,48,34,148,25,175,74,252,55,1,214, - 128,94,224,56,72,18,182,141,182,229,182,203,54,215,86,222,190,216,112,90,164,59,59, - 83,83,125,253,225,129,136,96,102,168,42,254,159,0,104,0,46,128,28,96,9,232,6, - 206,130,212,97,159,104,104,46,174,156,124,105,225,238,200,76,86,181,254,247,0,70,128, - 50,224,21,136,15,38,132,26,227,75,9,247,70,198,178,210,245,157,135,41,162,158,249, - 168,66,254,177,128,116,96,39,104,26,174,139,60,103,81,234,188,79,49,244,20,71,79, - 114,180,37,183,91,54,187,86,243,126,197,224,83,8,61,198,145,146,236,109,141,237,165, - 141,187,37,179,91,53,251,87,3,126,129,224,96,72,40,54,158,150,232,110,206,172,84, - 125,255,97,128,40,96,30,168,8,126,134,160,98,248,41,130,158,225,168,72,126,182,160, - 118,248,38,194,154,209,171,28,127,73,224,54,200,22,214,142,222,228,88,75,122,183,99, - 54,169,214,254,222,192,88,80,58,188,19,49,205,212,85,159,127,40,32,30,152,8,106, - 134,175,34,252,25,129,202,224,87,8,62,134,144,98,236,41,141,222,229,152,75,42,183, - 95,54,184,22,242,142,197,164,83,59,125,211,97,157,232,105,142,174,228,124,75,97,247, - 104,70,174,178,252,117,129,231,32,74,152,55,42,150,159,46,232,28,78,137,244,102,199, - 106,210,175,29,188,9,177,198,244,82,199,125,146,161,173,184,125,178,161,181,184,119,50, - 166,149,186,239,51,12,21,197,207,19,20,13,207,69,148,51,47,85,220,63,25,208,10, - 220,7,25,194,138,209,167,28,122,137,227,38,201,218,214,219,30,219,72,91,118,187,102, - 243,106,197,239,19,12,13,197,197,147,19,45,205,221,149,153,175,42,252,31,1,200,0, - 86,128,62,224,16,72,12,54,133,214,227,30,201,200,86,214,190,222,240,88,68,58,179, - 83,53,253,215,1,158,128,104,96,46,168,28,126,137,224,102,200,42,214,159,30,232,8, - 78,134,180,98,247,105,134,174,226,252,73,129,246,224,70,200,50,214,149,158,239,40,76, - 30,181,200,119,22,166,142,250,228,67,11,113,199,100,82,171,125,191,97,176,40,116,30, - 167,72,122,182,163,54,249,214,194,222,209,152,92,106,185,239,50,204,21,149,207,47,20, - 28,15,73,196,54,211,86,221,254,217,128,90,224,59,8,19,70,141,242,229,133,139,35, - 39,89,218,186,219,51,27,85,203,127,23,96,14,168,4,126,131,96,97,232,40,78,158, - 180,104,119,110,166,172,122,253,227,1,137,192,102,208,42,220,31,25,200,10,214,135,30, - 226,136,73,166,182,250,246,195,6,209,194,220,81,153,252,106,193,239,16,76,12,53,197, - 215,19,30,141,200,101,150,171,46,255,92,64,57,240,18,196,13,147,69,173,243,61,133, - 209,163,28,121,201,226,214,201,158,214,232,94,206,184,84,114,191,101,176,43,52,31,87, - 72,62,182,144,118,236,38,205,218,213,155,31,43,72,31,118,136,38,230,154,202,235,23, - 15,78,132,52,99,87,105,254,174,192,124,80,33,252,24,65,202,176,87,52,62,151,80, - 110,188,44,113,221,228,89,139,122,231,99,10,169,199,62,210,144,93,172,57,189,210,241, - 157,132,105,163,110,249,236,66,205,241,149,132,111,35,108,25,237,202,205,151,21,174,143, - 60,100,17,235,76,79,117,244,39,7,90,130,187,33,179,88,117,250,167,3,58,129,211, - 32,93,216,57,154,146,235,45,143,93,164,57,187,82,243,125,133,225,163,8,121,198,162, - 210,249,157,130,233,161,142,248,100,66,171,113,191,100,112,43,100,31,107,72,47,118,156, - 38,233,218,206,219,20,91,79,123,116,35,103,89,234,186,207,51,20,21,207,79,20,52, - 15,87,68,62,179,80,117,252,39,1,218,128,91,32,59,88,19,122,141,227,37,137,219, - 38,219,90,219,123,27,99,75,105,247,110,198,172,82,253,253,129,129,160,96,120,40,34, - 158,153,168,106,254,175,0,124,0,33,192,24,80,10,188,7,49,194,148,81,175,124,124, - 33,225,216,72,90,182,187,54,243,86,197,254,211,0,93,192,57,144,18,236,13,141,197, - 165,147,59,45,211,93,157,249,169,130,254,225,128,72,96,54,168,22,254,142,192,100,80, - 43,124,31,97,200,40,86,158,190,232,112,78,164,52,123,87,99,126,169,224,126,200,32, - 86,152,62,234,144,79,44,52,29,215,73,158,182,232,118,206,166,212,122,223,99,24,41, - 202,158,215,40,94,158,184,104,114,174,165,188,123,49,227,84,73,255,118,192,38,208,26, - 220,11,25,199,74,210,183,29,182,137,182,230,246,202,198,215,18,222,141,152,101,170,171, - 63,63,80,16,60,12,17,197,204,83,21,253,207,1,148,0,111,64,44,48,29,212,9, - 159,70,232,50,206,149,148,111,47,108,28,45,201,221,150,217,174,218,252,91,1,251,64, - 67,112,49,228,20,75,79,119,116,38,167,90,250,187,3,51,65,213,240,95,4,56,3, - 82,129,253,160,65,184,48,114,148,37,175,91,60,59,81,211,124,93,225,249,136,66,230, - 177,138,244,103,7,106,130,175,33,188,24,113,202,164,87,59,126,147,96,109,232,45,142, - 157,164,105,187,110,243,108,69,237,243,13,133,197,163,19,57,205,210,213,157,159,41,168, - 30,254,136,64,102,176,42,244,31,7,72,2,182,129,182,224,118,200,38,214,154,222,235, - 24,79,74,180,55,55,86,150,190,238,240,76,68,53,243,87,5,254,131,0,97,192,40, - 80,30,188,8,113,198,164,82,251,125,131,97,161,232,120,78,162,180,121,183,98,246,169, - 134,254,226,192,73,144,54,236,22,205,206,213,148,95,47,120,28,34,137,217,166,218,250, - 219,3,27,65,203,112,87,100,62,171,80,127,124,32,33,216,24,90,138,187,39,51,90, - 149,251,47,3,92,1,249,192,66,208,49,156,20,105,207,110,212,44,95,93,248,57,130, - 146,225,173,136,125,166,161,186,248,115,2,165,193,187,16,115,76,37,245,219,7,27,66, - 139,113,167,100,122,171,99,63,105,208,46,220,28,89,201,250,214,195,30,209,200,92,86, - 185,254,242,192,69,144,51,44,21,221,207,25,148,10,239,71,12,50,133,213,163,31,57, - 200,18,214,141,158,229,168,75,62,183,80,118,188,38,241,218,196,91,19,123,77,227,117, - 137,231,38,202,154,215,43,30,159,72,104,54,174,150,252,110,193,236,80,77,252,53,129, - 215,32,94,152,56,106,146,175,45,188,29,177,201,180,86,247,126,198,160,82,248,61,130, - 145,161,172,120,125,226,161,137,184,102,242,170,197,191,19,48,13,212,5,159,67,40,49, - 222,148,88,111,122,172,35,61,217,209,154,220,107,25,239,74,204,55,21,214,143,30,228, - 8,75,70,183,114,246,165,134,251,34,195,89,145,250,236,67,13,241,197,132,83,35,125, - 217,225,154,200,107,22,175,78,252,52,65,215,112,94,164,56,123,82,163,125,185,225,178, - 200,117,150,167,46,250,156,67,41,241,222,196,88,83,122,189,227,49,137,212,102,223,106, - 216,47,26,156,11,41,199,94,210,184,93,178,185,181,178,247,53,134,151,34,238,153,140, - 106,229,239,11,12,7,69,194,179,17,181,204,119,21,230,143,10,228,7,11,66,135,113, - 162,164,121,187,98,243,105,133,238,227,12,73,197,246,211,6,221,194,217,145,154,236,107, - 13,239,69,140,51,37,213,219,31,27,72,11,118,135,102,226,170,201,191,22,240,14,196, - 4,83,67,125,241,225,132,72,99,118,169,230,254,202,192,87,16,62,140,16,101,204,43, - 21,223,79,24,52,10,151,71,46,178,156,117,169,231,62,202,144,87,44,62,157,208,105, - 156,46,233,220,78,217,244,90,199,123,18,163,77,185,245,178,199,53,146,151,45,174,157, - 188,105,177,238,244,76,71,117,242,167,5,186,131,51,33,213,216,95,26,184,11,50,135, - 85,162,191,57,176,18,244,13,135,69,162,179,57,181,210,247,29,134,137,162,230,249,138, - 194,231,17,138,140,103,37,234,155,15,43,68,31,115,72,37,246,155,6,235,66,207,113, - 148,36,111,91,108,59,109,211,109,157,237,169,141,190,229,176,75,52,55,87,86,190,190, - 240,112,68,36,51,91,85,251,127,3,96,1,232,0,78,128,52,96,23,104,14,174,132, - 124,99,97,233,232,78,206,180,84,119,127,102,160,42,248,31,2,136,1,166,128,122,224, - 35,8,25,198,138,210,231,29,138,137,167,38,250,154,195,43,17,223,76,88,53,250,151, - 3,46,129,220,96,89,232,58,206,147,20,109,207,109,148,45,175,93,188,57,177,210,244, - 93,135,121,162,162,249,185,130,242,225,133,136,99,38,169,218,254,219,0,91,64,59,112, - 19,100,13,235,69,143,115,36,37,219,91,27,123,75,99,119,105,230,174,202,252,87,1, - 254,128,64,96,48,40,20,30,143,72,100,54,171,86,255,126,192,32,80,24,60,10,145, - 199,44,82,157,253,169,129,190,224,112,72,36,54,155,86,235,126,207,96,84,40,63,94, - 144,56,108,18,173,205,189,149,177,175,52,124,23,97,206,168,84,126,191,96,112,40,36, - 30,155,72,107,118,175,102,252,42,193,223,16,88,12,58,133,211,35,29,217,201,154,214, - 235,30,207,72,84,54,191,86,240,62,196,16,83,76,61,245,209,135,28,98,137,233,166, - 206,250,212,67,31,113,200,36,86,155,126,235,96,79,104,52,46,151,92,110,185,236,114, - 205,229,149,139,47,39,92,26,185,203,50,215,85,158,191,40,112,30,164,8,123,70,163, - 114,249,229,130,203,33,151,88,110,186,172,115,61,229,209,139,28,103,73,234,182,207,54, - 212,22,223,78,216,52,90,151,123,46,163,92,121,249,226,194,201,145,150,236,110,205,236, - 85,141,255,37,128,27,32,11,88,7,122,130,163,33,185,216,114,218,165,155,59,43,83, - 95,125,248,33,130,152,97,170,168,127,62,160,16,120,12,34,133,217,163,26,249,203,2, - 215,65,158,176,104,116,46,167,92,122,185,227,50,201,213,150,223,46,216,28,90,137,251, - 38,195,90,209,251,28,67,73,241,246,196,70,211,114,221,229,153, -}; +const static unsigned char yellowbook_scrambler[2340] = { + 1,128,0,96,0,40,0,30,128,8,96,6,168,2,254,129,128,96,96,40,40,30,158, + 136,104,102,174,170,252,127,1,224,0,72,0,54,128,22,224,14,200,4,86,131,126,225, + 224,72,72,54,182,150,246,238,198,204,82,213,253,159,1,168,0,126,128,32,96,24,40, + 10,158,135,40,98,158,169,168,126,254,160,64,120,48,34,148,25,175,74,252,55,1,214, + 128,94,224,56,72,18,182,141,182,229,182,203,54,215,86,222,190,216,112,90,164,59,59, + 83,83,125,253,225,129,136,96,102,168,42,254,159,0,104,0,46,128,28,96,9,232,6, + 206,130,212,97,159,104,104,46,174,156,124,105,225,238,200,76,86,181,254,247,0,70,128, + 50,224,21,136,15,38,132,26,227,75,9,247,70,198,178,210,245,157,135,41,162,158,249, + 168,66,254,177,128,116,96,39,104,26,174,139,60,103,81,234,188,79,49,244,20,71,79, + 114,180,37,183,91,54,187,86,243,126,197,224,83,8,61,198,145,146,236,109,141,237,165, + 141,187,37,179,91,53,251,87,3,126,129,224,96,72,40,54,158,150,232,110,206,172,84, + 125,255,97,128,40,96,30,168,8,126,134,160,98,248,41,130,158,225,168,72,126,182,160, + 118,248,38,194,154,209,171,28,127,73,224,54,200,22,214,142,222,228,88,75,122,183,99, + 54,169,214,254,222,192,88,80,58,188,19,49,205,212,85,159,127,40,32,30,152,8,106, + 134,175,34,252,25,129,202,224,87,8,62,134,144,98,236,41,141,222,229,152,75,42,183, + 95,54,184,22,242,142,197,164,83,59,125,211,97,157,232,105,142,174,228,124,75,97,247, + 104,70,174,178,252,117,129,231,32,74,152,55,42,150,159,46,232,28,78,137,244,102,199, + 106,210,175,29,188,9,177,198,244,82,199,125,146,161,173,184,125,178,161,181,184,119,50, + 166,149,186,239,51,12,21,197,207,19,20,13,207,69,148,51,47,85,220,63,25,208,10, + 220,7,25,194,138,209,167,28,122,137,227,38,201,218,214,219,30,219,72,91,118,187,102, + 243,106,197,239,19,12,13,197,197,147,19,45,205,221,149,153,175,42,252,31,1,200,0, + 86,128,62,224,16,72,12,54,133,214,227,30,201,200,86,214,190,222,240,88,68,58,179, + 83,53,253,215,1,158,128,104,96,46,168,28,126,137,224,102,200,42,214,159,30,232,8, + 78,134,180,98,247,105,134,174,226,252,73,129,246,224,70,200,50,214,149,158,239,40,76, + 30,181,200,119,22,166,142,250,228,67,11,113,199,100,82,171,125,191,97,176,40,116,30, + 167,72,122,182,163,54,249,214,194,222,209,152,92,106,185,239,50,204,21,149,207,47,20, + 28,15,73,196,54,211,86,221,254,217,128,90,224,59,8,19,70,141,242,229,133,139,35, + 39,89,218,186,219,51,27,85,203,127,23,96,14,168,4,126,131,96,97,232,40,78,158, + 180,104,119,110,166,172,122,253,227,1,137,192,102,208,42,220,31,25,200,10,214,135,30, + 226,136,73,166,182,250,246,195,6,209,194,220,81,153,252,106,193,239,16,76,12,53,197, + 215,19,30,141,200,101,150,171,46,255,92,64,57,240,18,196,13,147,69,173,243,61,133, + 209,163,28,121,201,226,214,201,158,214,232,94,206,184,84,114,191,101,176,43,52,31,87, + 72,62,182,144,118,236,38,205,218,213,155,31,43,72,31,118,136,38,230,154,202,235,23, + 15,78,132,52,99,87,105,254,174,192,124,80,33,252,24,65,202,176,87,52,62,151,80, + 110,188,44,113,221,228,89,139,122,231,99,10,169,199,62,210,144,93,172,57,189,210,241, + 157,132,105,163,110,249,236,66,205,241,149,132,111,35,108,25,237,202,205,151,21,174,143, + 60,100,17,235,76,79,117,244,39,7,90,130,187,33,179,88,117,250,167,3,58,129,211, + 32,93,216,57,154,146,235,45,143,93,164,57,187,82,243,125,133,225,163,8,121,198,162, + 210,249,157,130,233,161,142,248,100,66,171,113,191,100,112,43,100,31,107,72,47,118,156, + 38,233,218,206,219,20,91,79,123,116,35,103,89,234,186,207,51,20,21,207,79,20,52, + 15,87,68,62,179,80,117,252,39,1,218,128,91,32,59,88,19,122,141,227,37,137,219, + 38,219,90,219,123,27,99,75,105,247,110,198,172,82,253,253,129,129,160,96,120,40,34, + 158,153,168,106,254,175,0,124,0,33,192,24,80,10,188,7,49,194,148,81,175,124,124, + 33,225,216,72,90,182,187,54,243,86,197,254,211,0,93,192,57,144,18,236,13,141,197, + 165,147,59,45,211,93,157,249,169,130,254,225,128,72,96,54,168,22,254,142,192,100,80, + 43,124,31,97,200,40,86,158,190,232,112,78,164,52,123,87,99,126,169,224,126,200,32, + 86,152,62,234,144,79,44,52,29,215,73,158,182,232,118,206,166,212,122,223,99,24,41, + 202,158,215,40,94,158,184,104,114,174,165,188,123,49,227,84,73,255,118,192,38,208,26, + 220,11,25,199,74,210,183,29,182,137,182,230,246,202,198,215,18,222,141,152,101,170,171, + 63,63,80,16,60,12,17,197,204,83,21,253,207,1,148,0,111,64,44,48,29,212,9, + 159,70,232,50,206,149,148,111,47,108,28,45,201,221,150,217,174,218,252,91,1,251,64, + 67,112,49,228,20,75,79,119,116,38,167,90,250,187,3,51,65,213,240,95,4,56,3, + 82,129,253,160,65,184,48,114,148,37,175,91,60,59,81,211,124,93,225,249,136,66,230, + 177,138,244,103,7,106,130,175,33,188,24,113,202,164,87,59,126,147,96,109,232,45,142, + 157,164,105,187,110,243,108,69,237,243,13,133,197,163,19,57,205,210,213,157,159,41,168, + 30,254,136,64,102,176,42,244,31,7,72,2,182,129,182,224,118,200,38,214,154,222,235, + 24,79,74,180,55,55,86,150,190,238,240,76,68,53,243,87,5,254,131,0,97,192,40, + 80,30,188,8,113,198,164,82,251,125,131,97,161,232,120,78,162,180,121,183,98,246,169, + 134,254,226,192,73,144,54,236,22,205,206,213,148,95,47,120,28,34,137,217,166,218,250, + 219,3,27,65,203,112,87,100,62,171,80,127,124,32,33,216,24,90,138,187,39,51,90, + 149,251,47,3,92,1,249,192,66,208,49,156,20,105,207,110,212,44,95,93,248,57,130, + 146,225,173,136,125,166,161,186,248,115,2,165,193,187,16,115,76,37,245,219,7,27,66, + 139,113,167,100,122,171,99,63,105,208,46,220,28,89,201,250,214,195,30,209,200,92,86, + 185,254,242,192,69,144,51,44,21,221,207,25,148,10,239,71,12,50,133,213,163,31,57, + 200,18,214,141,158,229,168,75,62,183,80,118,188,38,241,218,196,91,19,123,77,227,117, + 137,231,38,202,154,215,43,30,159,72,104,54,174,150,252,110,193,236,80,77,252,53,129, + 215,32,94,152,56,106,146,175,45,188,29,177,201,180,86,247,126,198,160,82,248,61,130, + 145,161,172,120,125,226,161,137,184,102,242,170,197,191,19,48,13,212,5,159,67,40,49, + 222,148,88,111,122,172,35,61,217,209,154,220,107,25,239,74,204,55,21,214,143,30,228, + 8,75,70,183,114,246,165,134,251,34,195,89,145,250,236,67,13,241,197,132,83,35,125, + 217,225,154,200,107,22,175,78,252,52,65,215,112,94,164,56,123,82,163,125,185,225,178, + 200,117,150,167,46,250,156,67,41,241,222,196,88,83,122,189,227,49,137,212,102,223,106, + 216,47,26,156,11,41,199,94,210,184,93,178,185,181,178,247,53,134,151,34,238,153,140, + 106,229,239,11,12,7,69,194,179,17,181,204,119,21,230,143,10,228,7,11,66,135,113, + 162,164,121,187,98,243,105,133,238,227,12,73,197,246,211,6,221,194,217,145,154,236,107, + 13,239,69,140,51,37,213,219,31,27,72,11,118,135,102,226,170,201,191,22,240,14,196, + 4,83,67,125,241,225,132,72,99,118,169,230,254,202,192,87,16,62,140,16,101,204,43, + 21,223,79,24,52,10,151,71,46,178,156,117,169,231,62,202,144,87,44,62,157,208,105, + 156,46,233,220,78,217,244,90,199,123,18,163,77,185,245,178,199,53,146,151,45,174,157, + 188,105,177,238,244,76,71,117,242,167,5,186,131,51,33,213,216,95,26,184,11,50,135, + 85,162,191,57,176,18,244,13,135,69,162,179,57,181,210,247,29,134,137,162,230,249,138, + 194,231,17,138,140,103,37,234,155,15,43,68,31,115,72,37,246,155,6,235,66,207,113, + 148,36,111,91,108,59,109,211,109,157,237,169,141,190,229,176,75,52,55,87,86,190,190, + 240,112,68,36,51,91,85,251,127,3,96,1,232,0,78,128,52,96,23,104,14,174,132, + 124,99,97,233,232,78,206,180,84,119,127,102,160,42,248,31,2,136,1,166,128,122,224, + 35,8,25,198,138,210,231,29,138,137,167,38,250,154,195,43,17,223,76,88,53,250,151, + 3,46,129,220,96,89,232,58,206,147,20,109,207,109,148,45,175,93,188,57,177,210,244, + 93,135,121,162,162,249,185,130,242,225,133,136,99,38,169,218,254,219,0,91,64,59,112, + 19,100,13,235,69,143,115,36,37,219,91,27,123,75,99,119,105,230,174,202,252,87,1, + 254,128,64,96,48,40,20,30,143,72,100,54,171,86,255,126,192,32,80,24,60,10,145, + 199,44,82,157,253,169,129,190,224,112,72,36,54,155,86,235,126,207,96,84,40,63,94, + 144,56,108,18,173,205,189,149,177,175,52,124,23,97,206,168,84,126,191,96,112,40,36, + 30,155,72,107,118,175,102,252,42,193,223,16,88,12,58,133,211,35,29,217,201,154,214, + 235,30,207,72,84,54,191,86,240,62,196,16,83,76,61,245,209,135,28,98,137,233,166, + 206,250,212,67,31,113,200,36,86,155,126,235,96,79,104,52,46,151,92,110,185,236,114, + 205,229,149,139,47,39,92,26,185,203,50,215,85,158,191,40,112,30,164,8,123,70,163, + 114,249,229,130,203,33,151,88,110,186,172,115,61,229,209,139,28,103,73,234,182,207,54, + 212,22,223,78,216,52,90,151,123,46,163,92,121,249,226,194,201,145,150,236,110,205,236, + 85,141,255,37,128,27,32,11,88,7,122,130,163,33,185,216,114,218,165,155,59,43,83, + 95,125,248,33,130,152,97,170,168,127,62,160,16,120,12,34,133,217,163,26,249,203,2, + 215,65,158,176,104,116,46,167,92,122,185,227,50,201,213,150,223,46,216,28,90,137,251, + 38,195,90,209,251,28,67,73,241,246,196,70,211,114,221,229,153, +}; diff --git a/luapatch-res.h b/luapatch-res.h index b3b60e2..774f4ff 100644 --- a/luapatch-res.h +++ b/luapatch-res.h @@ -1,42 +1,42 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by luapatch.rc -// -#define IDD_FILESELECT 101 -#define IDD_ABOUT 102 -#define ID_FILE_QUIT 104 -#define IDI_ICON 105 -#define IDD_OPTIONS 107 -#define IDD_INFOS 109 -#define IDC_ABOUTTEXT 1001 -#define IDC_ABOUT 1003 -#define IDC_ST_SOURCETYPE 1004 -#define IDC_OPTIONS 1005 -#define IDC_SOURCETYPE 1007 -#define IDC_ST_SOURCE 1008 -#define IDC_DRIVE 1009 -#define IDC_DEST 1010 -#define IDC_DEST_SELECT 1011 -#define IDC_ST_DEST 1012 -#define IDC_PATCH 1013 -#define IDC_ST_PATCH 1014 -#define IDC_PATCH_SELECT 1015 -#define IDC_SOURCE 1016 -#define IDC_SOURCEFILE_SELECT 1017 -#define IDC_SOURCE_SELECT 1017 -#define IDC_ST_PATCH_TITLE 1018 -#define IDC_TITLE 1020 -#define IDC_ST_TITLE 1020 -#define IDC_INFOS 1023 -#define IDC_EDIT1 1027 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 110 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1028 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by luapatch.rc +// +#define IDD_FILESELECT 101 +#define IDD_ABOUT 102 +#define ID_FILE_QUIT 104 +#define IDI_ICON 105 +#define IDD_OPTIONS 107 +#define IDD_INFOS 109 +#define IDC_ABOUTTEXT 1001 +#define IDC_ABOUT 1003 +#define IDC_ST_SOURCETYPE 1004 +#define IDC_OPTIONS 1005 +#define IDC_SOURCETYPE 1007 +#define IDC_ST_SOURCE 1008 +#define IDC_DRIVE 1009 +#define IDC_DEST 1010 +#define IDC_DEST_SELECT 1011 +#define IDC_ST_DEST 1012 +#define IDC_PATCH 1013 +#define IDC_ST_PATCH 1014 +#define IDC_PATCH_SELECT 1015 +#define IDC_SOURCE 1016 +#define IDC_SOURCEFILE_SELECT 1017 +#define IDC_SOURCE_SELECT 1017 +#define IDC_ST_PATCH_TITLE 1018 +#define IDC_TITLE 1020 +#define IDC_ST_TITLE 1020 +#define IDC_INFOS 1023 +#define IDC_EDIT1 1027 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 110 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1028 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/luapatch.rc b/luapatch.rc index 467ec6b..1bd8d79 100644 --- a/luapatch.rc +++ b/luapatch.rc @@ -1,258 +1,257 @@ -// Microsoft Visual C++ generated resource script. -// -#include "luapatch-res.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Neutral resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_OPTIONS DIALOGEX 0, 0, 186, 81 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | - WS_CAPTION | WS_SYSMENU -CAPTION "Options" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,22,60,50,14,BS_CENTER | BS_FLAT - LTEXT "",IDC_ST_TITLE,7,17,172,8 - COMBOBOX IDC_OPTIONS,7,36,172,80,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP -END - -IDD_FILESELECT DIALOGEX 0, 0, 188, 194 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | - WS_CAPTION | WS_SYSMENU -CAPTION "LuaPatch" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,58,173,50,14,BS_FLAT - PUSHBUTTON "Quit",IDCANCEL,131,173,50,14,BS_FLAT - PUSHBUTTON "About",IDC_ABOUT,7,173,50,14,BS_FLAT - LTEXT "Source type:",IDC_ST_SOURCETYPE,7,7,174,11,WS_DISABLED - COMBOBOX IDC_SOURCETYPE,7,18,174,78,CBS_DROPDOWNLIST | - CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - LTEXT "Source:",IDC_ST_SOURCE,7,40,174,8,WS_DISABLED - COMBOBOX IDC_DRIVE,7,50,174,55,CBS_DROPDOWNLIST | CBS_SORT | NOT - WS_VISIBLE | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - LTEXT "Destination file:",IDC_ST_DEST,7,73,174,8,WS_DISABLED - EDITTEXT IDC_DEST,7,84,156,14,ES_AUTOHSCROLL | WS_DISABLED - PUSHBUTTON "...",IDC_DEST_SELECT,166,84,15,14,WS_DISABLED - LTEXT "Patch file:",IDC_ST_PATCH,7,110,174,8 - EDITTEXT IDC_PATCH,7,121,156,14,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_PATCH_SELECT,166,121,15,14 - EDITTEXT IDC_SOURCE,7,49,156,14,ES_AUTOHSCROLL | WS_DISABLED - PUSHBUTTON "...",IDC_SOURCE_SELECT,166,49,15,14,WS_DISABLED - LTEXT "",IDC_ST_PATCH_TITLE,7,144,174,8 - PUSHBUTTON "Options",IDC_OPTIONS,131,156,50,14,BS_FLAT | - WS_DISABLED - PUSHBUTTON "Infos",IDC_INFOS,7,156,50,14,BS_FLAT | WS_DISABLED -END - -IDD_ABOUT DIALOGEX 0, 0, 215, 106 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | - WS_POPUP | WS_CAPTION -EXSTYLE WS_EX_PALETTEWINDOW -CAPTION "About..." -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,7,85,50,14,BS_CENTER | BS_FLAT - CTEXT "LuaPatch version 0.4.0\nHand made special MFC version\n\nA CD patching system\n\nCopyrignt © 2003-2005 Nicolas ""Pixel"" Noble / NOBIS\n\nhttp://www.nobis-crew.org/luapatch/\nhttp://www.nobis-crew.org/", - IDC_ABOUTTEXT,7,7,201,77 -END - -IDD_INFOS DIALOGEX 0, 0, 479, 302 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | - WS_CAPTION | WS_SYSMENU -CAPTION "Informations" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,165,281,50,14,BS_CENTER | BS_FLAT - EDITTEXT IDC_INFOS,7,7,465,268,ES_MULTILINE | ES_AUTOHSCROLL | - ES_READONLY | WS_VSCROLL | WS_HSCROLL -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_OPTIONS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 74 - END - - IDD_FILESELECT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 181 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_ABOUT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 208 - TOPMARGIN, 7 - BOTTOMMARGIN, 99 - END - - IDD_INFOS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 472 - TOPMARGIN, 7 - BOTTOMMARGIN, 295 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog Info -// - -IDD_FILESELECT DLGINIT -BEGIN - IDC_SOURCETYPE, 0x403, 6, 0, 0x7771, 0x2065, 0x002e, 0 -END - -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "luapatch-res.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Neutral (Sys. Default) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD) -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,0,0 - PRODUCTVERSION 0,4,0,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "Comments", "LuaPatcher - CD Patching system" - VALUE "CompanyName", "NOBIS - http://www.nobis-crew.org/" - VALUE "FileDescription", "LuaPatcher - CD Patching system" - VALUE "FileVersion", "0, 4, 0, 0" - VALUE "LegalCopyright", "Copyright © 2003-2005 Nicolas ""Pixel"" Noble / NOBIS" - VALUE "ProductName", "LuaPatch" - VALUE "ProductVersion", "0, 4, 0, 0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200, 0x40c, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON ICON "cdrom.ico" -#endif // Neutral (Sys. Default) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "luapatch-res.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Neutral resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_OPTIONS DIALOGEX 0, 0, 186, 81 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Options" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,22,60,50,14,BS_CENTER | BS_FLAT + LTEXT "",IDC_ST_TITLE,7,17,172,8 + COMBOBOX IDC_OPTIONS,7,36,172,80,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_FILESELECT DIALOGEX 0, 0, 188, 194 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "LuaPatch" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,58,173,50,14,BS_FLAT + PUSHBUTTON "Quit",IDCANCEL,131,173,50,14,BS_FLAT + PUSHBUTTON "About",IDC_ABOUT,7,173,50,14,BS_FLAT + LTEXT "Source type:",IDC_ST_SOURCETYPE,7,7,174,11,WS_DISABLED + COMBOBOX IDC_SOURCETYPE,7,18,174,78,CBS_DROPDOWNLIST | + CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + LTEXT "Source:",IDC_ST_SOURCE,7,40,174,8,WS_DISABLED + COMBOBOX IDC_DRIVE,7,50,174,55,CBS_DROPDOWNLIST | CBS_SORT | NOT + WS_VISIBLE | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + LTEXT "Destination file:",IDC_ST_DEST,7,73,174,8,WS_DISABLED + EDITTEXT IDC_DEST,7,84,156,14,ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "...",IDC_DEST_SELECT,166,84,15,14,WS_DISABLED + LTEXT "Patch file:",IDC_ST_PATCH,7,110,174,8 + EDITTEXT IDC_PATCH,7,121,156,14,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_PATCH_SELECT,166,121,15,14 + EDITTEXT IDC_SOURCE,7,49,156,14,ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "...",IDC_SOURCE_SELECT,166,49,15,14,WS_DISABLED + LTEXT "",IDC_ST_PATCH_TITLE,7,144,174,8 + PUSHBUTTON "Options",IDC_OPTIONS,131,156,50,14,BS_FLAT | + WS_DISABLED + PUSHBUTTON "Infos",IDC_INFOS,7,156,50,14,BS_FLAT | WS_DISABLED +END + +IDD_ABOUT DIALOGEX 0, 0, 215, 106 +STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | + WS_POPUP | WS_CAPTION +EXSTYLE WS_EX_PALETTEWINDOW +CAPTION "About..." +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,85,50,14,BS_CENTER | BS_FLAT + CTEXT "LuaPatch version 0.4.0\nHand made special MFC version\n\nA CD patching system\n\nCopyrignt © 2003-2005 Nicolas ""Pixel"" Noble / NOBIS\n\nhttp://www.nobis-crew.org/luapatch/\nhttp://www.nobis-crew.org/", + IDC_ABOUTTEXT,7,7,201,77 +END + +IDD_INFOS DIALOGEX 0, 0, 479, 302 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Informations" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,165,281,50,14,BS_CENTER | BS_FLAT + EDITTEXT IDC_INFOS,7,7,465,268,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL | WS_HSCROLL +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_OPTIONS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 74 + END + + IDD_FILESELECT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 181 + TOPMARGIN, 7 + BOTTOMMARGIN, 187 + END + + IDD_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 208 + TOPMARGIN, 7 + BOTTOMMARGIN, 99 + END + + IDD_INFOS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 472 + TOPMARGIN, 7 + BOTTOMMARGIN, 295 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog Info +// + +IDD_FILESELECT DLGINIT +BEGIN + IDC_SOURCETYPE, 0x403, 6, 0, 0x7771, 0x2065, 0x002e, 0 +END + +#endif // Neutral resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "luapatch-res.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// Neutral (Sys. Default) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,4,0,0 + PRODUCTVERSION 0,4,0,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "Comments", "LuaPatcher - CD Patching system" + VALUE "CompanyName", "NOBIS - http://www.nobis-crew.org/" + VALUE "FileDescription", "LuaPatcher - CD Patching system" + VALUE "FileVersion", "0, 4, 0, 0" + VALUE "LegalCopyright", "Copyright © 2003-2005 Nicolas ""Pixel"" Noble / NOBIS" + VALUE "ProductName", "LuaPatch" + VALUE "ProductVersion", "0, 4, 0, 0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200, 0x40c, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "cdrom.ico" +#endif // Neutral (Sys. Default) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/nmakefile b/nmakefile index cd18310..4a069bc 100644 --- a/nmakefile +++ b/nmakefile @@ -1,20 +1,20 @@ -_CCFLAGS = /I includes /I psxdev /I generic\include /I generic\lib\lua\include /I generic\lib\zlib\include /I msvc /I msvc\getopt -!IFDEF DEBUG -_LIBS = "MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.lib" comdlg32.lib user32.lib -!ELSE -_LIBS = "MSVC\Baltisot - generic\Release\Baltisot - generic.lib" "MSVC\PSX-Bundle - library\Release\PSX-Bundle - library.lib" comdlg32.lib user32.lib -!ENDIF - -!include MSVC\Tools\master.mak - -#------------------------------------------------------------------ - -TARGETS = bgrep.exe cd-tool.exe crypto-search.exe lzss-main.exe luapatch.res luapatch.exe -SUBDIRS = - -all : $(TARGETS) - for %i in ( $(SUBDIRS) ) do $(_MAKE_IN_DIR) %i all - -clean : - -del /Q $(TARGETS) *.ilk *.pdb *.obj - for %i in ( $(SUBDIRS) ) do $(_MAKE_IN_DIR) %i clean +_CCFLAGS = /I includes /I psxdev /I generic\include /I generic\lib\lua\include /I generic\lib\zlib\include /I msvc /I msvc\getopt +!IFDEF DEBUG +_LIBS = "MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.lib" comdlg32.lib user32.lib +!ELSE +_LIBS = "MSVC\Baltisot - generic\Release\Baltisot - generic.lib" "MSVC\PSX-Bundle - library\Release\PSX-Bundle - library.lib" comdlg32.lib user32.lib +!ENDIF + +!include MSVC\Tools\master.mak + +#------------------------------------------------------------------ + +TARGETS = bgrep.exe cd-tool.exe crypto-search.exe lzss-main.exe luapatch.res luapatch.exe +SUBDIRS = + +all : $(TARGETS) + for %i in ( $(SUBDIRS) ) do $(_MAKE_IN_DIR) %i all + +clean : + -del /Q $(TARGETS) *.ilk *.pdb *.obj + for %i in ( $(SUBDIRS) ) do $(_MAKE_IN_DIR) %i clean -- cgit v1.2.3