Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[cfinck] 31718: Trying to fix the build on Unix hosts by only using host headers in widl
by cfinck＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: cfinck Date: Fri Jan 11 17:46:27 2008 New Revision: 31718 URL: http://svn.reactos.org/svn/reactos?rev=31718&view=rev Log: Trying to fix the build on Unix hosts by only using host headers in widl Modified: trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=3171… ============================================================================== --- trunk/reactos/tools/widl/hash.c (original) +++ trunk/reactos/tools/widl/hash.c Fri Jan 11 17:46:27 2008 @@ -21,9 +21,7 @@ #include <stdio.h> #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include <host/nls.h> #include "hash.h" Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typelib.c (original) +++ trunk/reactos/tools/widl/typelib.c Fri Jan 11 17:46:27 2008 @@ -35,8 +35,7 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include <host/typedefs.h> #include "widl.h" #include "utils.h" Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Fri Jan 11 17:46:27 2008 @@ -20,6 +20,13 @@ #ifndef __WIDL_WIDLTYPES_H #define __WIDL_WIDLTYPES_H + +#define S_OK 0 +#define S_FALSE 1 +#define E_OUTOFMEMORY ((HRESULT)0x8007000EL) +#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L) + +#define max(a, b) ((a) > (b) ? a : b) #include <stdarg.h> #include "guiddef.h" Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c (original) +++ trunk/reactos/tools/widl/write_msft.c Fri Jan 11 17:46:27 2008 @@ -40,10 +40,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include <host/typedefs.h> +#include <host/nls.h> #include "widltypes.h" #include "typelib.h"

1 0

[fireball] 31717: - Switch to the new widl and new rpcrt4. - Old widl had some more patches applies, and old rpcrt4 had Saveliy Tretiakov's patches applied. They were not explicitly added into this update (some of them might be reworked and got accepted by Wine).
by fireball＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: fireball Date: Fri Jan 11 16:46:33 2008 New Revision: 31717 URL: http://svn.reactos.org/svn/reactos?rev=31717&view=rev Log: - Switch to the new widl and new rpcrt4. - Old widl had some more patches applies, and old rpcrt4 had Saveliy Tretiakov's patches applied. They were not explicitly added into this update (some of them might be reworked and got accepted by Wine). Added: trunk/reactos/dll/win32/rpcrt4/cproxy.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/cpsf.c trunk/reactos/dll/win32/rpcrt4/cpsf.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/cpsf.h trunk/reactos/dll/win32/rpcrt4/cstub.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/cstub.c trunk/reactos/dll/win32/rpcrt4/epm_towers.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/epm_towers.h trunk/reactos/dll/win32/rpcrt4/ncastatus.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ncastatus.h trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_clientserver.c trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_contexthandle.c trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_fullpointer.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_ole.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_assoc.h trunk/reactos/dll/win32/rpcrt4/rpc_binding.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_defs.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_defs.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpc_transport.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rc - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpcrt4.rc trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_main.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpcss_np_client.c trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/rpcss_np_client.h trunk/reactos/dll/win32/rpcrt4/unix_func.c - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/unix_func.c trunk/reactos/dll/win32/rpcrt4/unix_func.h - copied unchanged from r31674, trunk/reactos/dll/win32/rpcrt4_new/unix_func.h trunk/reactos/tools/widl/client.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/client.c trunk/reactos/tools/widl/hash.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/hash.c trunk/reactos/tools/widl/hash.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/hash.h trunk/reactos/tools/widl/header.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/header.c trunk/reactos/tools/widl/header.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/header.h trunk/reactos/tools/widl/parser.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/parser.h trunk/reactos/tools/widl/parser.l - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/parser.l trunk/reactos/tools/widl/parser.tab.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/parser.tab.c trunk/reactos/tools/widl/parser.tab.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/parser.tab.h trunk/reactos/tools/widl/parser.y - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/parser.y trunk/reactos/tools/widl/parser.yy.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/parser.yy.c trunk/reactos/tools/widl/proxy.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/proxy.c trunk/reactos/tools/widl/server.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/server.c trunk/reactos/tools/widl/typegen.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/typegen.c trunk/reactos/tools/widl/typegen.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/typegen.h trunk/reactos/tools/widl/typelib.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/typelib.c trunk/reactos/tools/widl/typelib.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/typelib.h trunk/reactos/tools/widl/typelib_struct.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/typelib_struct.h trunk/reactos/tools/widl/utils.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/utils.c trunk/reactos/tools/widl/utils.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/utils.h trunk/reactos/tools/widl/widl.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/widl.c trunk/reactos/tools/widl/widl.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/widl.h trunk/reactos/tools/widl/widl.mak - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/widl.mak trunk/reactos/tools/widl/widl_ros.diff - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/widl_ros.diff trunk/reactos/tools/widl/widltypes.h - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/widltypes.h trunk/reactos/tools/widl/write_msft.c - copied unchanged from r31674, trunk/reactos/tools/widl_20080105/write_msft.c Removed: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h trunk/reactos/dll/win32/rpcrt4/ndr_midl.c trunk/reactos/dll/win32/rpcrt4/rpc_misc.h trunk/reactos/dll/win32/rpcrt4_new/ trunk/reactos/tools/widl/ChangeLog trunk/reactos/tools/widl/Makefile.in trunk/reactos/tools/widl/lex.yy.c trunk/reactos/tools/widl/widl.man.in trunk/reactos/tools/widl_20080105/ trunk/reactos/tools/widl_new/ Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… Removed: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… Removed: trunk/reactos/dll/win32/rpcrt4/ndr_midl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_midl.… Removed: trunk/reactos/dll/win32/rpcrt4/rpc_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_misc.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Removed: trunk/reactos/tools/widl/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/ChangeLog?rev=3… Removed: trunk/reactos/tools/widl/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/Makefile.in?rev… Removed: trunk/reactos/tools/widl/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/lex.yy.c?rev=31… Removed: trunk/reactos/tools/widl/widl.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.man.in?rev…

1 0

[fireball] 31716: - Add missing \n to the debug print.
by fireball＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: fireball Date: Fri Jan 11 16:15:53 2008 New Revision: 31716 URL: http://svn.reactos.org/svn/reactos?rev=31716&view=rev Log: - Add missing \n to the debug print. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c Fri Jan 11 16:15:53 2008 @@ -118,7 +118,7 @@ return; } - DPRINT("LsarStartRpcServer() done"); + DPRINT("LsarStartRpcServer() done\n"); } /* Function 0 */

1 0

[fireball] 31715: - Apply adapted patch by Damjan Jovanovic <damjan.jov@gmail.com> "Make RpcMgmtWaitServerListen wait for the server to stop listening, like it is supposed to". Rob Shearman commented that "it prevented the dispatching of simultaneous RPCs on an endpoint", however it's enough for ReactOS for now, until a better patch is made. - Uncomment commented out error checks. - Update rpcrt4_ros.diff accordingly.
by fireball＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: fireball Date: Fri Jan 11 16:13:05 2008 New Revision: 31715 URL: http://svn.reactos.org/svn/reactos?rev=31715&view=rev Log: - Apply adapted patch by Damjan Jovanovic <damjan.jov(a)gmail.com> "Make RpcMgmtWaitServerListen wait for the server to stop listening, like it is supposed to". Rob Shearman commented that "it prevented the dispatching of simultaneous RPCs on an endpoint", however it's enough for ReactOS for now, until a better patch is made. - Uncomment commented out error checks. - Update rpcrt4_ros.diff accordingly. Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_s… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_server.c Fri Jan 11 16:13:05 2008 @@ -1019,7 +1019,7 @@ */ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) { - TRACE("()\n"); + RpcServerProtseq *cps; EnterCriticalSection(&listen_cs); @@ -1027,10 +1027,18 @@ LeaveCriticalSection(&listen_cs); return RPC_S_NOT_LISTENING; } - + + do + { + LeaveCriticalSection(&listen_cs); + + LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) + WaitForSingleObject(cps->server_ready_event, INFINITE); + + EnterCriticalSection(&listen_cs); + } while (!std_listen); + LeaveCriticalSection(&listen_cs); - - FIXME("not waiting for server calls to finish\n"); return RPC_S_OK; } Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_t… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c Fri Jan 11 16:13:05 2008 @@ -375,7 +375,7 @@ break; ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); - if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) + if (!ret && GetLastError() != ERROR_MORE_DATA) break; bytes_left -= bytes_read; @@ -400,7 +400,7 @@ break; ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); - if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) + if (!ret && GetLastError() != ERROR_MORE_DATA) break; bytes_left -= bytes_written; Modified: trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpcrt… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff Fri Jan 11 16:13:05 2008 @@ -1,5 +1,40 @@ ---- H:\Working Copies\wine\dlls\rpcrt4\rpc_transport.c Sun Jan 06 19:27:38 2008 -+++ H:\Working Copies\ReactOS\trunk\reactos\dll\win32\rpcrt4\rpc_transport.c Mon Jan 07 16:02:15 2008 +--- rpc_server.c Tue Jan 01 13:09:34 2008 ++++ rpc_server.c Fri Jan 11 15:58:57 2008 +@@ -1017,22 +1017,30 @@ + /*********************************************************************** + * RpcMgmtServerWaitListen (RPCRT4.@) + */ + RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) + { +- TRACE("()\n"); ++ RpcServerProtseq *cps; + + EnterCriticalSection(&listen_cs); + + if (!std_listen) { + LeaveCriticalSection(&listen_cs); + return RPC_S_NOT_LISTENING; + } + ++ do ++ { + LeaveCriticalSection(&listen_cs); + +- FIXME("not waiting for server calls to finish\n"); ++ LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) ++ WaitForSingleObject(cps->server_ready_event, INFINITE); ++ ++ EnterCriticalSection(&listen_cs); ++ } while (!std_listen); ++ ++ LeaveCriticalSection(&listen_cs); + + return RPC_S_OK; + } + + /*********************************************************************** +--- rpc_transport.c Sun Jan 06 19:27:38 2008 ++++ rpc_transport.c Fri Jan 11 15:59:32 2008 @@ -54,10 +54,13 @@ #endif #ifdef HAVE_SYS_POLL_H @@ -127,7 +162,7 @@ break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); -+ if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) ++ if (!ret && GetLastError() != ERROR_MORE_DATA) + break; + bytes_left -= bytes_read; @@ -148,7 +183,7 @@ break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); -+ if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) ++ if (!ret && GetLastError() != ERROR_MORE_DATA) + break; + bytes_left -= bytes_written;

1 0

[hpoussin] 31714: Display hardware wizard only after user logged in. It still needs improvement, to first try once to install without user intervention, and then, once an admin is logged on, ask it for still not installed devices.
by hpoussin＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: hpoussin Date: Fri Jan 11 16:00:44 2008 New Revision: 31714 URL: http://svn.reactos.org/svn/reactos?rev=31714&view=rev Log: Display hardware wizard only after user logged in. It still needs improvement, to first try once to install without user intervention, and then, once an admin is logged on, ask it for still not installed devices. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Fri Jan 11 16:00:44 2008 @@ -207,6 +207,9 @@ DPRINT("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId); + if (hInstallEvent != NULL) + SetEvent(hInstallEvent); + /* Get the users token */ hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, @@ -226,8 +229,8 @@ } /* Trigger the installer thread */ - if (hInstallEvent != NULL) - SetEvent(hInstallEvent); + /*if (hInstallEvent != NULL) + SetEvent(hInstallEvent);*/ return CR_SUCCESS; } @@ -1679,6 +1682,8 @@ BOOL showWizard; UNREFERENCED_PARAMETER(lpParameter); + + WaitForSingleObject(hInstallEvent, INFINITE); showWizard = !SetupIsActive() && !IsConsoleBoot();

1 0

[hpoussin] 31713: Add missing \n
by hpoussin＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: hpoussin Date: Fri Jan 11 14:35:44 2008 New Revision: 31713 URL: http://svn.reactos.org/svn/reactos?rev=31713&view=rev Log: Add missing \n Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Fri Jan 11 14:35:44 2008 @@ -131,7 +131,7 @@ case IOCTL_KEYBOARD_SET_INDICATORS: { TRACE_(I8042PRT, "IOCTL_KEYBOARD_SET_INDICATORS\n"); - INFO_(I8042PRT, "Leds: {%s%s%s }", + INFO_(I8042PRT, "Leds: {%s%s%s }\n", DeviceExtension->KeyboardIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON ? " CAPSLOCK" : "", DeviceExtension->KeyboardIndicators.LedFlags & KEYBOARD_NUM_LOCK_ON ? " NUMLOCK" : "", DeviceExtension->KeyboardIndicators.LedFlags & KEYBOARD_SCROLL_LOCK_ON ? " SCROLLLOCK" : "");

1 0

[hpoussin] 31712: Use same UNIMPLEMENTED macro syntax as in other parts
by hpoussin＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: hpoussin Date: Fri Jan 11 14:35:09 2008 New Revision: 31712 URL: http://svn.reactos.org/svn/reactos?rev=31712&view=rev Log: Use same UNIMPLEMENTED macro syntax as in other parts Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Fri Jan 11 14:35:09 2008 @@ -1030,7 +1030,7 @@ /* BIOS graphics mode */ else { - UNIMPLEMENTED(); + UNIMPLEMENTED; } } Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Fri Jan 11 14:35:09 2008 @@ -85,6 +85,6 @@ #endif // defined DBG -#define UNIMPLEMENTED() BugCheck((DPRINT_WARNING, "This function is unimplemented!\n")) +#define UNIMPLEMENTED BugCheck((DPRINT_WARNING, "This function is unimplemented!\n")) #endif // defined __DEBUG_H

1 0

[fireball] 31711: Dmitry Philippov <shedon@mail.ru> - Respect format of the returned string (unicode or ansi). This fixes the text inside csrss hard error message box. - Unicode->ansi conversion is done especially.
by fireball＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: fireball Date: Fri Jan 11 14:16:02 2008 New Revision: 31711 URL: http://svn.reactos.org/svn/reactos?rev=31711&view=rev Log: Dmitry Philippov <shedon(a)mail.ru> - Respect format of the returned string (unicode or ansi). This fixes the text inside csrss hard error message box. - Unicode->ansi conversion is done especially. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Fri Jan 11 14:16:02 2008 @@ -357,8 +357,17 @@ UNICODE_STRING MessageU; ANSI_STRING MessageA; - RtlInitUnicodeString(&MessageU, (PWSTR)MessageResource->Text); - RtlUnicodeStringToAnsiString(&MessageA, &MessageU, TRUE); + if( !MessageResource->Flags ) { + /* we've got an ansi string */ + DPRINT("MessageResource->Text=%s\n", (PSTR)MessageResource->Text); + RtlInitAnsiString(&MessageA, MessageResource->Text); + } + else { + /* we've got a unicode string */ + DPRINT("MessageResource->Text=%S\n", (PWSTR)MessageResource->Text); + RtlInitUnicodeString(&MessageU, (PWSTR)MessageResource->Text); + RtlUnicodeStringToAnsiString(&MessageA, &MessageU, TRUE); + } USHORT CaptionSize = 0; // check whether a caption exists @@ -387,6 +396,7 @@ wsprintfW(szxCaptionText, L"System"); } } + DPRINT("ParameterList[0]=0x%lx\n", ParameterList[0]); if( STATUS_UNHANDLED_EXCEPTION == HardErrorMessage->Status ) { PRTL_MESSAGE_RESOURCE_ENTRY MsgResException; @@ -402,10 +412,17 @@ { UNICODE_STRING ExcMessageU; ANSI_STRING ExcMessageA; - - RtlInitUnicodeString(&ExcMessageU, (PWSTR)MsgResException->Text); - - RtlUnicodeStringToAnsiString(&ExcMessageA, &ExcMessageU, TRUE); + if( !MsgResException->Flags ) { + /* we've got an ansi string */ + DPRINT("MsgResException->Text=%s\n", (PSTR)MsgResException->Text); + RtlInitAnsiString(&ExcMessageA, MsgResException->Text); + } + else { + /* we've got a unicode string */ + DPRINT("MsgResException->Text=%S\n", (PWSTR)MsgResException->Text); + RtlInitUnicodeString(&ExcMessageU, (PWSTR)MsgResException->Text); + RtlUnicodeStringToAnsiString(&ExcMessageA, &ExcMessageU, TRUE); + } MessageBody = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MsgResException->Length+SizeOfAllUnicodeStrings+1024); // 1024 is a magic number I think it should be enough if( STATUS_ACCESS_VIOLATION == ParameterList[0] ) {

1 0

[fireball] 31710: - Import rpcrt4 tests from Wine-20080105. - There is an ugly hack applied, which defines the relative path to the server_*.h files inside obj-i386 directory, thus being dependent on its name.
by fireball＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: fireball Date: Fri Jan 11 13:57:59 2008 New Revision: 31710 URL: http://svn.reactos.org/svn/reactos?rev=31710&view=rev Log: - Import rpcrt4 tests from Wine-20080105. - There is an ugly hack applied, which defines the relative path to the server_*.h files inside obj-i386 directory, thus being dependent on its name. Added: trunk/rostests/winetests/rpcrt4/cstub.c (with props) trunk/rostests/winetests/rpcrt4/generated.c (with props) trunk/rostests/winetests/rpcrt4/ndr_marshall.c (with props) trunk/rostests/winetests/rpcrt4/rpc.c (with props) trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild (with props) trunk/rostests/winetests/rpcrt4/server.c (with props) trunk/rostests/winetests/rpcrt4/server.idl (with props) trunk/rostests/winetests/rpcrt4/server_defines.h (with props) trunk/rostests/winetests/rpcrt4/testlist.c (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Added: trunk/rostests/winetests/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/cstub.c?… Added: trunk/rostests/winetests/rpcrt4/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/generate… Added: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… Added: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… Added: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… Added: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… Added: trunk/rostests/winetests/rpcrt4/server.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.i… Added: trunk/rostests/winetests/rpcrt4/server_defines.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server_d… Added: trunk/rostests/winetests/rpcrt4/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/testlist…

1 0

[hpoussin] 31709: Prevent creation 1500000 temporary objects by caching value of CompilationUnit::GetFilename(). Limit access to variables of CompilationUnit
by hpoussin＠svn.reactos.org 11 Jan '08

11 Jan '08

Author: hpoussin Date: Fri Jan 11 12:09:49 2008 New Revision: 31709 URL: http://svn.reactos.org/svn/reactos?rev=31709&view=rev Log: Prevent creation 1500000 temporary objects by caching value of CompilationUnit::GetFilename(). Limit access to variables of CompilationUnit Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/testsupportcode.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Fri Jan 11 12:09:49 2008 @@ -206,7 +206,7 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - if ( compilationUnit.files.size () != 1 ) + if ( compilationUnit.GetFiles ().size () != 1 ) return false; } // intentionally make a copy so that we can append more work in @@ -224,7 +224,7 @@ for ( j = 0; j < compilationUnits.size (); j++ ) { CompilationUnit& compilationUnit = *compilationUnits[j]; - if ( compilationUnit.files.size () != 1 ) + if ( compilationUnit.GetFiles ().size () != 1 ) return false; } } 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 Fri Jan 11 12:09:49 2008 @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Casper S. Hornstrup + * 2007-2008 Hervé Poussineau * * 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 @@ -342,12 +343,12 @@ MingwModuleHandler::GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit ) const { - if ( compilationUnit.files.size () <= 1 ) + if ( compilationUnit.GetFiles ().size () <= 1 ) return ""; vector<string> sourceFiles; - for ( size_t i = 0; i < compilationUnit.files.size (); i++ ) - { - File& file = *compilationUnit.files[i]; + for ( size_t i = 0; i < compilationUnit.GetFiles ().size (); i++ ) + { + const File& file = *compilationUnit.GetFiles ()[i]; sourceFiles.push_back ( backend->GetFullName ( file.file ) ); } return v2s ( sourceFiles, 10 ); @@ -412,13 +413,12 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation *compilationName = compilationUnit.GetFilename (); - const FileLocation *objectFilename = GetObjectFilename ( compilationName, importedModule, NULL ); + const FileLocation& compilationName = compilationUnit.GetFilename (); + const FileLocation *objectFilename = GetObjectFilename ( &compilationName, importedModule, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) dep += ssprintf ( " $(%s_HEADERS)", importedModule.name.c_str () ); else if ( GetExtension ( *objectFilename ) == ".rc" ) dep += ssprintf ( " $(%s_MCHEADERS)", importedModule.name.c_str () ); - delete compilationName; } } else @@ -483,10 +483,9 @@ { if ( includeGeneratedFiles || !compilationUnits[i]->IsGeneratedFile () ) { - const FileLocation *compilationName = compilationUnits[i]->GetFilename (); - const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationName ); + const FileLocation& compilationName = compilationUnits[i]->GetFilename (); + const FileLocation* sourceFileLocation = GetActualSourceFilename ( &compilationName ); list.push_back ( *sourceFileLocation ); - delete compilationName; delete sourceFileLocation; } } @@ -507,10 +506,9 @@ CompilationUnit& compilationUnit = *compilationUnits[j]; if ( includeGeneratedFiles || !compilationUnit.IsGeneratedFile () ) { - const FileLocation *compilationName = compilationUnit.GetFilename (); - const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationName ); + const FileLocation& compilationName = compilationUnit.GetFilename (); + const FileLocation* sourceFileLocation = GetActualSourceFilename ( &compilationName ); list.push_back ( *sourceFileLocation ); - delete compilationName; delete sourceFileLocation; } } @@ -670,10 +668,9 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - const FileLocation *compilationName = compilationUnits[i]->GetFilename (); - const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); + const FileLocation& compilationName = compilationUnits[i]->GetFilename (); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); objectFilenames += backend->GetFullName ( *object_file ); - delete compilationName; delete object_file; } return objectFilenames; @@ -1021,13 +1018,12 @@ for ( i = 0; i < compilationUnits.size(); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation *compilationName = compilationUnit.GetFilename (); + const FileLocation& compilationName = compilationUnit.GetFilename (); fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), - backend->GetFullName ( *compilationName ).c_str () ); - delete compilationName; + backend->GetFullName ( compilationName ).c_str () ); } fprintf ( fMakefile, "\n" ); } @@ -1062,13 +1058,12 @@ GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { - const FileLocation *compilationName = sourceCompilationUnits[i]->GetFilename (); + const FileLocation& compilationName = sourceCompilationUnits[i]->GetFilename (); fprintf ( fMakefile, "%s += %s\n", sourcesMacro.c_str(), - backend->GetFullName ( *compilationName ).c_str () ); - delete compilationName; + backend->GetFullName ( compilationName ).c_str () ); } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -1091,15 +1086,14 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( compilationUnit.IsFirstFile () ) { - const FileLocation *compilationName = compilationUnit.GetFilename (); - const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); + const FileLocation& compilationName = compilationUnit.GetFilename (); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), backend->GetFullName ( *object_file ).c_str (), objectsMacro.c_str() ); delete object_file; - delete compilationName; } } fprintf ( @@ -1112,13 +1106,13 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( !compilationUnit.IsFirstFile () ) { - const FileLocation *compilationName = compilationUnit.GetFilename (); - const FileLocation *objectFilename = GetObjectFilename ( compilationName, module, NULL ); + const FileLocation& compilationName = compilationUnit.GetFilename (); + const FileLocation *objectFilename = GetObjectFilename ( &compilationName, module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) headers.push_back ( objectFilename ); else if ( GetExtension ( *objectFilename ) == ".rc" ) { - const FileLocation *headerFilename = GetMcHeaderFilename ( compilationUnit.GetFilename () ); + const FileLocation *headerFilename = GetMcHeaderFilename ( &compilationUnit.GetFilename () ); mcheaders.push_back ( headerFilename ); mcresources.push_back ( objectFilename ); } @@ -1131,7 +1125,6 @@ backend->GetFullName ( *objectFilename ).c_str () ); delete objectFilename; } - delete compilationName; } } fprintf ( fMakefile, "\n" ); @@ -1223,15 +1216,14 @@ GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { - const FileLocation *compilationName = sourceCompilationUnits[i]->GetFilename (); - const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); + const FileLocation& compilationName = sourceCompilationUnits[i]->GetFilename (); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); fprintf ( fMakefile, "%s += %s\n", objectsMacro.c_str(), backend->GetFullName ( *object_file ).c_str () ); delete object_file; - delete compilationName; } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -1487,17 +1479,17 @@ const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string dependencies = backend->GetFullName ( sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( sourceFile->name ); - - const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( sourceFile ); + string basename = GetBasename ( sourceFile.name ); + + const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( &sourceFile ); CLEAN_FILE ( *generatedHeaderFilename ); FileLocation generatedServerFilename ( IntermediateDirectory, - sourceFile->relative_path, + sourceFile.relative_path, basename + "_s.c" ); CLEAN_FILE ( generatedServerFilename ); @@ -1515,10 +1507,9 @@ widlflagsMacro.c_str (), backend->GetFullName ( *generatedHeaderFilename ).c_str (), backend->GetFullName ( generatedServerFilename ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); + backend->GetFullName ( sourceFile ).c_str () ); delete generatedHeaderFilename; - delete sourceFile; } /* caller needs to delete the returned object */ @@ -1550,14 +1541,14 @@ const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string dependencies = backend->GetFullName ( sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( sourceFile->name ); + string basename = GetBasename ( sourceFile.name ); FileLocation EmbeddedTypeLibFilename ( IntermediateDirectory, - sourceFile->relative_path, + sourceFile.relative_path, basename + ".tlb" ); fprintf ( fMakefile, @@ -1572,9 +1563,7 @@ GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), backend->GetFullName ( EmbeddedTypeLibFilename ).c_str(), - backend->GetFullName ( *sourceFile ).c_str () ); - - delete sourceFile; + backend->GetFullName ( sourceFile ).c_str () ); } void @@ -1582,17 +1571,17 @@ const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string dependencies = backend->GetFullName ( sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( sourceFile->name ); - - const FileLocation *generatedHeaderFilename = GetRpcClientHeaderFilename ( sourceFile ); + string basename = GetBasename ( sourceFile.name ); + + const FileLocation *generatedHeaderFilename = GetRpcClientHeaderFilename ( &sourceFile ); CLEAN_FILE ( *generatedHeaderFilename ); FileLocation generatedClientFilename ( IntermediateDirectory, - sourceFile->relative_path, + sourceFile.relative_path, basename + "_c.c" ); CLEAN_FILE ( generatedClientFilename ); @@ -1610,10 +1599,9 @@ widlflagsMacro.c_str (), backend->GetFullName ( *generatedHeaderFilename ).c_str (), backend->GetFullName ( generatedClientFilename ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); + backend->GetFullName ( sourceFile ).c_str () ); delete generatedHeaderFilename; - delete sourceFile; } void @@ -1621,13 +1609,13 @@ const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string dependencies = backend->GetFullName ( sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string basename = GetBasename ( sourceFile->name ); - - const FileLocation *generatedHeader = GetIdlHeaderFilename ( sourceFile ); + string basename = GetBasename ( sourceFile.name ); + + const FileLocation *generatedHeader = GetIdlHeaderFilename ( &sourceFile ); CLEAN_FILE ( *generatedHeader ); fprintf ( fMakefile, @@ -1642,10 +1630,9 @@ GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), backend->GetFullName ( *generatedHeader ).c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); + backend->GetFullName ( sourceFile ).c_str () ); delete generatedHeader; - delete sourceFile; } void @@ -1678,11 +1665,11 @@ const string& windresflagsMacro, const string& widlflagsMacro ) { - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string extension = GetExtension ( sourceFile ); if ( extension == ".c" || extension == ".C" ) { - GenerateGccCommand ( sourceFile, + GenerateGccCommand ( &sourceFile, GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, cc, cflagsMacro ); @@ -1691,35 +1678,35 @@ extension == ".cpp" || extension == ".CPP" || extension == ".cxx" || extension == ".CXX" ) { - GenerateGccCommand ( sourceFile, + GenerateGccCommand ( &sourceFile, GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, cppc, cflagsMacro ); } else if ( extension == ".s" || extension == ".S" ) { - GenerateGccAssemblerCommand ( sourceFile, + GenerateGccAssemblerCommand ( &sourceFile, cc, cflagsMacro ); } else if ( extension == ".asm" || extension == ".ASM" ) { - GenerateNasmCommand ( sourceFile, + GenerateNasmCommand ( &sourceFile, nasmflagsMacro ); } else if ( extension == ".rc" || extension == ".RC" ) { - GenerateWindresCommand ( sourceFile, + GenerateWindresCommand ( &sourceFile, windresflagsMacro ); } else if ( extension == ".mc" || extension == ".MC" ) { - GenerateWmcCommands ( sourceFile ); + GenerateWmcCommands ( &sourceFile ); } else if ( extension == ".spec" || extension == ".SPEC" ) { - GenerateWinebuildCommands ( sourceFile ); - GenerateGccCommand ( sourceFile, + GenerateWinebuildCommands ( &sourceFile ); + GenerateGccCommand ( &sourceFile, extraDependencies, cc, cflagsMacro ); @@ -1730,8 +1717,8 @@ widlflagsMacro ); if ( (module.type == RpcServer) || (module.type == RpcClient) ) { - GenerateGccCommand ( sourceFile, - GetExtraDependencies ( sourceFile ), + GenerateGccCommand ( &sourceFile, + GetExtraDependencies ( &sourceFile ), cc, cflagsMacro ); } @@ -1742,10 +1729,8 @@ __LINE__, "Unsupported filename extension '%s' in file '%s'", extension.c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - } - - delete sourceFile; + backend->GetFullName ( sourceFile ).c_str () ); + } } void @@ -1833,11 +1818,10 @@ for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *data.compilationUnits[i]; - const FileLocation *compilationName = compilationUnit.GetFilename (); - const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); + const FileLocation& compilationName = compilationUnit.GetFilename (); + const FileLocation *object_file = GetObjectFilename ( &compilationName, module, NULL ); objectFiles.push_back ( *object_file ); delete object_file; - delete compilationName; } } @@ -2023,13 +2007,12 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation *compilationName = compilationUnit.GetFilename (); - const FileLocation *objectFilename = GetObjectFilename ( compilationName, module, NULL ); + const FileLocation& compilationName = compilationUnit.GetFilename (); + const FileLocation *objectFilename = GetObjectFilename ( &compilationName, module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) moduleDependencies += ssprintf ( " $(%s_HEADERS)", module.name.c_str () ); else if ( GetExtension ( *objectFilename ) == ".rc" ) moduleDependencies += ssprintf ( " $(%s_RESOURCES)", module.name.c_str () ); - delete compilationName; delete objectFilename; } @@ -2257,31 +2240,30 @@ for ( size_t j = 0; j < library.importedModule->non_if_data.compilationUnits.size (); j++ ) { CompilationUnit& compilationUnit = *library.importedModule->non_if_data.compilationUnits[j]; - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string extension = GetExtension ( sourceFile ); if ( extension == ".idl" || extension == ".IDL" ) { - string basename = GetBasename ( sourceFile->name ); + string basename = GetBasename ( sourceFile.name ); if ( library.importedModule->type == RpcServer ) { - const FileLocation *header = GetRpcServerHeaderFilename ( sourceFile ); + const FileLocation *header = GetRpcServerHeaderFilename ( &sourceFile ); dependencies.push_back ( *header ); delete header; } if ( library.importedModule->type == RpcClient ) { - const FileLocation *header = GetRpcClientHeaderFilename ( sourceFile ); + const FileLocation *header = GetRpcClientHeaderFilename ( &sourceFile ); dependencies.push_back ( *header ); delete header; } if ( library.importedModule->type == IdlHeader ) { - const FileLocation *header = GetIdlHeaderFilename ( sourceFile ); + const FileLocation *header = GetIdlHeaderFilename ( &sourceFile ); dependencies.push_back ( *header ); delete header; } } - delete sourceFile; } } } @@ -2319,11 +2301,10 @@ for ( size_t i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string extension = GetExtension ( sourceFile ); if ( extension == ".spec" || extension == ".SPEC" ) - GetSpecObjectDependencies ( s, sourceFile ); - delete sourceFile; + GetSpecObjectDependencies ( s, &sourceFile ); } } if ( s.size () > 0 ) @@ -2573,14 +2554,13 @@ for ( size_t j = 0; j < m.non_if_data.compilationUnits.size (); j++ ) { CompilationUnit& compilationUnit = *m.non_if_data.compilationUnits[j]; - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( *sourceFile ); + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string extension = GetExtension ( sourceFile ); if (extension == ".mc" || extension == ".MC" ) { string dependency = ssprintf ( " $(%s_MCHEADERS)", m.name.c_str () ); dependencies.push_back ( dependency ); } - delete sourceFile; } } } @@ -2749,17 +2729,16 @@ const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; for ( size_t i = 0; i < compilationUnits.size (); i++ ) { - CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( *sourceFile ); + const CompilationUnit& compilationUnit = *compilationUnits[i]; + const FileLocation& sourceFile = compilationUnit.GetFilename (); + string extension = GetExtension ( sourceFile ); if ( extension == ".spec" || extension == ".SPEC" ) - GetSpecObjectDependencies ( dependencies, sourceFile ); + GetSpecObjectDependencies ( dependencies, &sourceFile ); if ( extension == ".idl" || extension == ".IDL" ) { if ( ( module.type == RpcServer ) || ( module.type == RpcClient ) ) - GetWidlObjectDependencies ( dependencies, sourceFile ); + GetWidlObjectDependencies ( dependencies, &sourceFile ); } - delete sourceFile; } } Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp Fri Jan 11 12:09:49 2008 @@ -23,12 +23,15 @@ using std::string; using std::vector; -CompilationUnit::CompilationUnit ( File* file ) +CompilationUnit::CompilationUnit ( const File* file ) : project(NULL), module(NULL), node(NULL) { - local_name = file->file.name; + default_name = new FileLocation ( IntermediateDirectory, + "", + file->file.name ); + name = file->file.relative_path + sSep + file->file.name; files.push_back ( file ); } @@ -42,7 +45,11 @@ { const XMLAttribute* att = node->GetAttribute ( "name", true ); assert(att); - local_name = att->value; + + default_name = new FileLocation ( IntermediateDirectory, + module ? module->output->relative_path : "", + att->value, + node ); name = module->output->relative_path + cSep + att->value; } @@ -58,7 +65,7 @@ { size_t i; for ( i = 0; i < files.size (); i++ ) - files[i]->ProcessXML (); + const_cast<File*> ( files[i] )->ProcessXML (); } bool @@ -66,7 +73,7 @@ { if ( files.size () != 1 ) return false; - File* file = files[0]; + const File* file = files[0]; string extension = GetExtension ( file->file ); return ( extension == ".spec" || extension == ".SPEC" || extension == ".mc" || extension == ".MC"); } @@ -77,7 +84,7 @@ size_t i; for ( i = 0; i < files.size (); i++ ) { - File& file = *files[i]; + const File& file = *files[i]; string fileExtension = GetExtension ( file.file ); if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) ) return true; @@ -90,31 +97,39 @@ { if ( files.size () == 0 || files.size () > 1 ) return false; - File* file = files[0]; + const File* file = files[0]; return file->first; } -const FileLocation* +const FileLocation& CompilationUnit::GetFilename () const { if ( files.size () == 0 || files.size () > 1 ) - { - return new FileLocation ( IntermediateDirectory, - module ? module->output->relative_path : "", - local_name, - node ); - } + return *default_name; - File* file = files[0]; - return new FileLocation ( file->file ); + const File* file = files[0]; + return file->file; } -std::string +const std::string& CompilationUnit::GetSwitches () const { + static const std::string empty_string = std::string(""); if ( files.size () == 0 || files.size () > 1 ) - return ""; - File* file = files[0]; + return empty_string; + const File* file = files[0]; return file->switches; } + +void +CompilationUnit::AddFile ( const File * file ) +{ + files.push_back ( file ); +} + +const std::vector<const File*> +CompilationUnit::GetFiles () const +{ + return files; +} Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp Fri Jan 11 12:09:49 2008 @@ -55,7 +55,7 @@ for ( size_t i = 0; i < module.non_if_data.compilationUnits.size () ; i++ ) { CompilationUnit& compilationUnit = *module.non_if_data.compilationUnits[i]; - if ( compilationUnit.files.size () <= 1 ) + if ( compilationUnit.GetFiles ().size () <= 1 ) continue; WriteCompilationUnitFile ( module, compilationUnit ); } @@ -83,9 +83,9 @@ s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); s = s + sprintf ( s, "#define ONE_COMPILATION_UNIT\n" ); - for ( size_t i = 0; i < compilationUnit.files.size () ; i++ ) + for ( size_t i = 0; i < compilationUnit.GetFiles ().size () ; i++ ) { - File& file = *compilationUnit.files[i]; + const File& file = *compilationUnit.GetFiles ()[i]; s = s + sprintf ( s, "#include <%s/%s>\n", ChangeSeparator ( file.file.relative_path, '\\', '/' ).c_str (), file.file.name.c_str () ); } 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 Fri Jan 11 12:09:49 2008 @@ -585,7 +585,7 @@ switches, false ); if ( parseContext.compilationUnit ) - parseContext.compilationUnit->files.push_back ( pFile ); + parseContext.compilationUnit->AddFile ( pFile ); else { CompilationUnit* pCompilationUnit = new CompilationUnit ( pFile ); 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 Fri Jan 11 12:09:49 2008 @@ -895,13 +895,9 @@ class CompilationUnit { public: - const Project* project; - const Module* module; - const XMLElement* node; std::string name; - std::vector<File*> files; - - CompilationUnit ( File* file ); + + CompilationUnit ( const File* file ); CompilationUnit ( const Project* project, const Module* module, const XMLElement* node ); @@ -910,10 +906,16 @@ bool IsGeneratedFile () const; bool HasFileWithExtension ( const std::string& extension ) const; bool IsFirstFile () const; - const FileLocation* GetFilename () const; - std::string GetSwitches () const; -private: - std::string local_name; + const FileLocation& GetFilename () const; + const std::string& GetSwitches () const; + void AddFile ( const File * file ); + const std::vector<const File*> GetFiles () const; +private: + const Project* project; + const Module* module; + const XMLElement* node; + std::vector<const File*> files; + FileLocation *default_name; }; Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/testsupportco… ============================================================================== --- trunk/reactos/tools/rbuild/testsupportcode.cpp (original) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp Fri Jan 11 12:09:49 2008 @@ -307,8 +307,8 @@ const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; for ( i = 0; i < compilationUnits.size (); i++ ) { - const FileLocation* sourceFileLocation = compilationUnits[i]->GetFilename (); - string filename = sourceFileLocation->relative_path + sSep + sourceFileLocation->name; + const FileLocation& sourceFileLocation = compilationUnits[i]->GetFilename (); + string filename = sourceFileLocation.relative_path + sSep + sourceFileLocation.name; if ( !compilationUnits[i]->IsGeneratedFile () && IsTestFile ( filename ) ) list.push_back ( filename ); } @@ -327,8 +327,8 @@ for ( j = 0; j < compilationUnits.size (); j++ ) { CompilationUnit& compilationUnit = *compilationUnits[j]; - const FileLocation* sourceFileLocation = compilationUnits[j]->GetFilename (); - string filename = sourceFileLocation->relative_path + sSep + sourceFileLocation->name; + const FileLocation& sourceFileLocation = compilationUnits[j]->GetFilename (); + string filename = sourceFileLocation.relative_path + sSep + sourceFileLocation.name; if ( !compilationUnit.IsGeneratedFile () && IsTestFile ( filename ) ) list.push_back ( filename ); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008