Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29385: - Fix ExAllocatePoolWithTag with a 0 tag.
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Thu Oct 4 00:30:41 2007 New Revision: 29385 URL: http://svn.reactos.org/svn/reactos?rev=29385&view=rev Log: - Fix ExAllocatePoolWithTag with a 0 tag. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Thu Oct 4 00:30:41 2007 @@ -447,7 +447,7 @@ /* Allocate the unicode buffer */ Length = LoadString.Length * sizeof(WCHAR) + sizeof(UNICODE_NULL); - Buffer = ExAllocatePoolWithTag(PagedPool, Length, 0); + Buffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); if (!Buffer) { /* Fail */

1 0

[gbrunmar] 29384: Added context menu on right click in treeviews
by gbrunmar＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: gbrunmar Date: Wed Oct 3 23:45:39 2007 New Revision: 29384 URL: http://svn.reactos.org/svn/reactos?rev=29384&view=rev Log: Added context menu on right click in treeviews Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed Oct 3 23:45:39 2007 @@ -172,3 +172,26 @@ if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); +@@ -4160,6 +4158,22 @@ + static LRESULT + TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) + { ++ TVHITTESTINFO ht; ++ ++ ht.pt = *pPt; ++ ++ TREEVIEW_HitTest(infoPtr, &ht); ++ ++ if (ht.hItem) ++ { ++ /* Change to screen coordinate for WM_CONTEXTMENU */ ++ ClientToScreen(infoPtr->hwnd, &ht.pt); ++ ++ /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ ++ SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, ++ (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); ++ } ++ + return 0; + } + Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Oct 3 23:45:39 2007 @@ -4158,6 +4158,22 @@ static LRESULT TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) { + TVHITTESTINFO ht; + + ht.pt = *pPt; + + TREEVIEW_HitTest(infoPtr, &ht); + + if (ht.hItem) + { + /* Change to screen coordinate for WM_CONTEXTMENU */ + ClientToScreen(infoPtr->hwnd, &ht.pt); + + /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ + SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); + } + return 0; }

1 0

[gbrunmar] 29383: * Fixed bug 2456 (propsheet's apply button enabling at the wrong time) See issue #2456 for more details.
by gbrunmar＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: gbrunmar Date: Wed Oct 3 23:34:34 2007 New Revision: 29383 URL: http://svn.reactos.org/svn/reactos?rev=29383&view=rev Log: * Fixed bug 2456 (propsheet's apply button enabling at the wrong time) See issue #2456 for more details. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/propsheet.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed Oct 3 23:34:34 2007 @@ -111,6 +111,15 @@ } /****************************************************************************** +@@ -3555,6 +3558,8 @@ + * from which to switch to the next page */ + SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0); + ++ PROPSHEET_UnChanged(hwnd, (HWND)wParam); ++ + return TRUE; + } + Index: tooltips.c =================================================================== --- tooltips.c (revision 25790) Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Wed Oct 3 23:34:34 2007 @@ -3558,6 +3558,8 @@ * from which to switch to the next page */ SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0); + PROPSHEET_UnChanged(hwnd, (HWND)wParam); + return TRUE; }

1 0

[janderwald] 29382: - deactivate signal handler for linux
by janderwald＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: janderwald Date: Wed Oct 3 21:53:03 2007 New Revision: 29382 URL: http://svn.reactos.org/svn/reactos?rev=29382&view=rev Log: - deactivate signal handler for linux Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Oct 3 21:53:03 2007 @@ -751,10 +751,11 @@ fclose(file); #endif OsSupport::cancelAlarms(); +#ifdef __LINUX__ + //OsSupport::setAlarm (m_MaxTime, m_Pid); + //OsSupport::setAlarm(m_MaxTime, getpid()); +#else OsSupport::setAlarm (m_MaxTime, m_Pid); -#ifdef __LINUX__ - OsSupport::setAlarm(m_MaxTime, getpid()); -#else OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); #endif

1 0

[fireball] 29381: Dmitry Chapyshev <lentind@yandex.ru> - Change listbox to listview - Draw icons - Add a find bar (it works, but will work better in future) - "Install" button moved to a separate tab, also buttons "Download!" and "Find in the Internet" are added there too - Applet's width increased - "Modify/Remove" button will become active only when an application is selected
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 21:50:43 2007 New Revision: 29381 URL: http://svn.reactos.org/svn/reactos?rev=29381&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Change listbox to listview - Draw icons - Add a find bar (it works, but will work better in future) - "Install" button moved to a separate tab, also buttons "Download!" and "Find in the Internet" are added there too - Applet's width increased - "Modify/Remove" button will become active only when an application is selected Added: trunk/reactos/dll/cpl/appwiz/add.c (with props) trunk/reactos/dll/cpl/appwiz/createlink.c (with props) trunk/reactos/dll/cpl/appwiz/remove.c (with props) trunk/reactos/dll/cpl/appwiz/resources/1501.ico (with props) trunk/reactos/dll/cpl/appwiz/resources/1502.ico (with props) trunk/reactos/dll/cpl/appwiz/resources/1503.ico (with props) trunk/reactos/dll/cpl/appwiz/resources/1504.ico (with props) trunk/reactos/dll/cpl/appwiz/resources/1505.ico (with props) trunk/reactos/dll/cpl/appwiz/rossetup.c (with props) Removed: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/da-DK.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/appwiz/lang/id-ID.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/appwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/resource.h trunk/reactos/dll/cpl/appwiz/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/cpl/appwiz/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/add.c?rev=2… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… Added: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… Removed: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… Removed: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… Removed: trunk/reactos/dll/cpl/appwiz/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/da-DK.… Removed: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… Removed: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… Removed: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… Removed: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… Removed: trunk/reactos/dll/cpl/appwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/hu-HU.… Removed: trunk/reactos/dll/cpl/appwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/id-ID.… Removed: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… Removed: trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ja-JP.… Removed: trunk/reactos/dll/cpl/appwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/nl-NL.… Removed: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… Removed: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… Removed: trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/th-TH.… Removed: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… Added: trunk/reactos/dll/cpl/appwiz/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re… Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… Added: trunk/reactos/dll/cpl/appwiz/resources/1501.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… Added: trunk/reactos/dll/cpl/appwiz/resources/1502.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… Added: trunk/reactos/dll/cpl/appwiz/resources/1503.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… Added: trunk/reactos/dll/cpl/appwiz/resources/1504.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… Added: trunk/reactos/dll/cpl/appwiz/resources/1505.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… Added: trunk/reactos/dll/cpl/appwiz/rossetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rossetup.c?… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev…

1 0

[janderwald] 29380: - fix linux build
by janderwald＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: janderwald Date: Wed Oct 3 21:38:18 2007 New Revision: 29380 URL: http://svn.reactos.org/svn/reactos?rev=29380&view=rev Log: - fix linux build Modified: trunk/reactos/tools/sysreg/os_support.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Wed Oct 3 21:38:18 2007 @@ -189,6 +189,11 @@ #else /********************************************************************************************************************/ + + + struct sigaction OsSupport::s_sact; + + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool bWait) { ProcessID pid; @@ -232,14 +237,12 @@ OsSupport::checkAlarms(); } } - void setAlarm(long secs, OsSupport::ProcessID pid) - { - sigemptyset( &sact.sa_mask ); + void OsSupport::setAlarm(long secs, OsSupport::ProcessID pid) + { + sigemptyset( &s_sact.sa_mask ); s_sact.sa_flags = 0; - s_sact.sa_handler = catcher; - sigaction( SIGALRM, &sact, NULL ); - - alarm(timeout); + s_sact.sa_handler = handleSignal; + sigaction( SIGALRM, &s_sact, NULL ); PTIME_ENTRY entry = (PTIME_ENTRY) malloc(sizeof(TIME_ENTRY)); if (entry) @@ -250,7 +253,7 @@ entry->tm = tm; entry->pid = pid; - for(int i = 0; i < s_Entries.size(); i++) + for(size_t i = 0; i < s_Entries.size(); i++) { if (tm.tv_sec < s_Entries[i]->tm.tv_sec && tm.tv_usec < s_Entries[i]->tm.tv_usec) {

1 0

[cwittich] 29379: fix some of the build errors
by cwittich＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: cwittich Date: Wed Oct 3 20:52:31 2007 New Revision: 29379 URL: http://svn.reactos.org/svn/reactos?rev=29379&view=rev Log: fix some of the build errors Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Wed Oct 3 20:52:31 2007 @@ -17,8 +17,9 @@ void OsSupport::checkAlarms() { struct timeval tm; + size_t i; gettimeofday(&tm, 0); - for (size_t i = 0; i < s_Entries.size(); i++) + for (i = 0; i < s_Entries.size(); i++) { long diffsec = s_Entries[i]->tm.tv_sec - tm.tv_sec; if (diffsec < 0) @@ -34,7 +35,7 @@ #ifdef __LINUX__ if (s_Entries.size()) { - long secs = Entries[i]->tm.tv_sec - tm.tv_sec; + long secs = s_Entries[i]->tm.tv_sec - tm.tv_sec; alarm(secs); } #endif @@ -64,7 +65,6 @@ #ifndef __LINUX__ - HANDLE OsSupport::s_hTimer = INVALID_HANDLE_VALUE; HANDLE OsSupport::s_hThread = 0; static HANDLE hTimer; bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Oct 3 20:52:31 2007 @@ -27,7 +27,6 @@ #include <assert.h> #include <math.h> #include <signal.h> - namespace Sysreg_ { @@ -754,7 +753,7 @@ OsSupport::cancelAlarms(); OsSupport::setAlarm (m_MaxTime, m_Pid); #ifdef __LINUX__ - OsSupport::setAlarm(m_MaxTime, _getpid()); + OsSupport::setAlarm(m_MaxTime, getpid()); #else OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); #endif

1 0

[hpoussin] 29377: Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 18:09:45 2007 New Revision: 29377 URL: http://svn.reactos.org/svn/reactos?rev=29377&view=rev Log: Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29377&r1=2937… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Oct 3 18:09:45 2007 @@ -298,7 +298,6 @@ objcopy = $(Q)$(PREFIX_)objcopy dlltool = $(Q)$(PREFIX_)dlltool strip = $(Q)$(PREFIX_)strip -windres = $(Q)$(PREFIX_)windres # Set utilities ifeq ($(OSTYPE),msys) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Oct 3 18:09:45 2007 @@ -1095,55 +1095,39 @@ const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); - if ( module.useWRC ) - { - string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); - FileLocation rciFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".rci.tmp" ); - FileLocation resFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".res.tmp" ); - - fprintf ( fMakefile, - "%s: %s $(WRC_TARGET) | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); - fprintf ( fMakefile, - "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( *sourceFile ).c_str (), - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( rciFilename ).c_str (), - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t${windres} %s -o $@\n", - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( resFilename ).c_str () ); - } - else - { - fprintf ( fMakefile, - "%s: %s $(WRC_TARGET) | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); - fprintf ( fMakefile, - "\t${windres} $(%s) %s -o $@\n", - windresflagsMacro.c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - } + string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); + FileLocation rciFilename ( TemporaryDirectory, + "", + sourceFilenamePart + ".rci.tmp" ); + FileLocation resFilename ( TemporaryDirectory, + "", + sourceFilenamePart + ".res.tmp" ); + + fprintf ( fMakefile, + "%s: %s $(WRC_TARGET) | %s\n", + backend->GetFullName ( *objectFilename ).c_str (), + dependencies.c_str (), + backend->GetFullPath ( *objectFilename ).c_str () ); + fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); + fprintf ( fMakefile, + "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", + windresflagsMacro.c_str (), + backend->GetFullName ( *sourceFile ).c_str (), + backend->GetFullName ( rciFilename ).c_str () ); + fprintf ( fMakefile, + "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", + windresflagsMacro.c_str (), + backend->GetFullName ( rciFilename ).c_str (), + backend->GetFullName ( resFilename ).c_str () ); + fprintf ( fMakefile, + "\t-@${rm} %s 2>$(NUL)\n", + backend->GetFullName ( rciFilename ).c_str () ); + fprintf ( fMakefile, + "\t${windres} %s -o $@\n", + backend->GetFullName ( resFilename ).c_str () ); + fprintf ( fMakefile, + "\t-@${rm} %s 2>$(NUL)\n", + backend->GetFullName ( resFilename ).c_str () ); } void Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Wed Oct 3 18:09:45 2007 @@ -414,12 +414,6 @@ } else install = NULL; - - att = moduleNode.GetAttribute ( "usewrc", false ); - if ( att != NULL ) - useWRC = att->value == "true"; - else - useWRC = true; att = moduleNode.GetAttribute ( "allowwarnings", false ); if ( att == NULL ) Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Wed Oct 3 18:09:45 2007 @@ -123,7 +123,6 @@ underscoresymbols (true|yes|false|no) "no" installbase %Text; #IMPLIED installname %Text; #IMPLIED - usewrc %Text; #IMPLIED allowwarnings (true|false) "false" aliasof %Text; #IMPLIED unicode (true|yes|false|no) "no" Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Wed Oct 3 18:09:45 2007 @@ -355,7 +355,6 @@ std::string prefix; HostType host; std::string aliasedModuleName; - bool useWRC; bool allowWarnings; bool enabled; bool isStartupLib;

1 0

[hpoussin] 29376: Remove hack added in r28961. It seems that wrc works well now.
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 18:02:04 2007 New Revision: 29376 URL: http://svn.reactos.org/svn/reactos?rev=29376&view=rev Log: Remove hack added in r28961. It seems that wrc works well now. Modified: trunk/reactos/base/shell/explorer/explorer.rbuild Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild Wed Oct 3 18:02:04 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" usewrc="false"> +<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> <linkerflag>-fexceptions</linkerflag> <include base="explorer">.</include> <define name="__USE_W32API" />

1 0

[hpoussin] 29375: Implement NdisMWriteLogData, enough to see something
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 17:48:51 2007 New Revision: 29375 URL: http://svn.reactos.org/svn/reactos?rev=29375&view=rev Log: Implement NdisMWriteLogData, enough to see something Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c Wed Oct 3 17:48:51 2007 @@ -2048,9 +2048,36 @@ IN PVOID LogBuffer, IN UINT LogBufferSize) { - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; + PUCHAR Buffer = LogBuffer; + UINT i, j, idx; + + UNIMPLEMENTED; + for (i = 0; i < LogBufferSize; i += 16) + { + DbgPrint("%08x |", i); + for (j = 0; j < 16; j++) + { + idx = i + j; + if (idx < LogBufferSize) + DbgPrint(" %02x", Buffer[idx]); + else + DbgPrint(" "); + } + DbgPrint(" | "); + for (j = 0; j < 16; j++) + { + idx = i + j; + if (idx == LogBufferSize) + break; + if (Buffer[idx] >= ' ') /* FIXME: not portable! replace by if (isprint(Buffer[idx])) ? */ + DbgPrint("%c", Buffer[idx]); + else + DbgPrint("."); + } + DbgPrint("\n"); + } + + return NDIS_STATUS_FAILURE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs