[fireball] 25460: - Merge 25373 - Merge 25396 (only the part related to semgr.c file) - Merge 25399
Author: fireball Date: Mon Jan 15 01:36:14 2007 New Revision: 25460
URL: http://svn.reactos.org/svn/reactos?rev=25460&view=rev Log: - Merge 25373 - Merge 25396 (only the part related to semgr.c file) - Merge 25399
Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c
Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskrn... ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c Mon Jan 15 01:36:14 2007 @@ -1054,7 +1054,7 @@ } else { - *AccessStatus = STATUS_ACCESS_DENIED; + *AccessStatus = STATUS_SUCCESS; DPRINT("FIX caller rights (granted 0x%lx, desired 0x%lx)!\n", *GrantedAccess, DesiredAccess); return TRUE; /* FIXME: should be FALSE */
Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/r... ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Mon Jan 15 01:36:14 2007 @@ -302,24 +302,29 @@ for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - - std::string Cbp_file = CbpFileName ( module ); - fprintf ( OUT, "\t\t<Project filename="%s">\r\n", Cbp_file.c_str()); - - /* dependencies */ - vector<const IfableData*> ifs_list; - ifs_list.push_back ( &module.project.non_if_data ); - ifs_list.push_back ( &module.non_if_data ); - while ( ifs_list.size() ) - { - const IfableData& data = *ifs_list.back(); - ifs_list.pop_back(); - const vector<Library*>& libs = data.libraries; - for ( size_t j = 0; j < libs.size(); j++ ) - fprintf ( OUT, "\t\t\t<Depends filename="%s\%s_auto.cbp" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); - } - fprintf ( OUT, "\t\t</Project>\r\n" ); - + + if ((module.type != Iso) && + (module.type != LiveIso) && + (module.type != IsoRegTest) && + (module.type != LiveIsoRegTest)) + { + std::string Cbp_file = CbpFileName ( module ); + fprintf ( OUT, "\t\t<Project filename="%s">\r\n", Cbp_file.c_str()); + + /* dependencies */ + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + const vector<Library*>& libs = data.libraries; + for ( size_t j = 0; j < libs.size(); j++ ) + fprintf ( OUT, "\t\t\t<Depends filename="%s\%s_auto.cbp" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); + } + fprintf ( OUT, "\t\t</Project>\r\n" ); + } } fprintf ( OUT, "\t</Workspace>\r\n" ); fprintf ( OUT, "</CodeBlocks_workspace_file>\r\n" );
Modified: branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/w... ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h (original) +++ branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h Mon Jan 15 01:36:14 2007 @@ -220,6 +220,8 @@ extern int parse_spec_file( FILE *file, DLLSPEC *spec ); extern int parse_def_file( FILE *file, DLLSPEC *spec );
+extern int mkstemps(char *template, int suffix_len); + /* global variables */
extern int current_line;
Modified: branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/w... ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c (original) +++ branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c Mon Jan 15 01:36:14 2007 @@ -203,12 +203,12 @@ printf("LANGUAGE <not set>\n");
if(l->version) - printf("VERSION %08lx\n", *(l->version)); + printf("VERSION %08x\n", *(l->version)); else printf("VERSION <not set>\n");
if(l->characts) - printf("CHARACTERISTICS %08lx\n", *(l->characts)); + printf("CHARACTERISTICS %08x\n", *(l->characts)); else printf("CHARACTERISTICS <not set>\n"); } @@ -537,16 +537,16 @@ { assert(ctrl->style != NULL); assert(ctrl->style->and_mask == 0); - printf("\tStyle: %08lx\n", ctrl->style->or_mask); + printf("\tStyle: %08x\n", ctrl->style->or_mask); } if(ctrl->gotexstyle) { assert(ctrl->exstyle != NULL); assert(ctrl->exstyle->and_mask == 0); - printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask); + printf("\tExStyle: %08x\n", ctrl->exstyle->or_mask); } if(ctrl->gothelpid) - printf("\tHelpid: %ld\n", ctrl->helpid); + printf("\tHelpid: %u\n", ctrl->helpid); if(ctrl->extra) { printf("\t"); @@ -577,14 +577,14 @@ { assert(dlg->style != NULL); assert(dlg->style->and_mask == 0); - printf("Style: %08lx\n", dlg->style->or_mask); + printf("Style: %08x\n", dlg->style->or_mask);
} if(dlg->gotexstyle) { assert(dlg->exstyle != NULL); assert(dlg->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlg->exstyle->or_mask); + printf("ExStyle: %08x\n", dlg->exstyle->or_mask); } printf("Menu: %s\n", get_nameid_str(dlg->menu)); printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); @@ -627,16 +627,16 @@ { assert(dlgex->style != NULL); assert(dlgex->style->and_mask == 0); - printf("Style: %08lx\n", dlgex->style->or_mask); + printf("Style: %08x\n", dlgex->style->or_mask); } if(dlgex->gotexstyle) { assert(dlgex->exstyle != NULL); assert(dlgex->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlgex->exstyle->or_mask); + printf("ExStyle: %08x\n", dlgex->exstyle->or_mask); } if(dlgex->gothelpid) - printf("Helpid: %ld\n", dlgex->helpid); + printf("Helpid: %u\n", dlgex->helpid); printf("Menu: %s\n", get_nameid_str(dlgex->menu)); printf("Class: %s\n", get_nameid_str(dlgex->dlgclass)); printf("Title: "); print_string(dlgex->title); printf("\n"); @@ -683,7 +683,7 @@ if(item->name) { print_string(item->name); - printf(", %d, %08lx", item->id, item->state); + printf(", %d, %08x", item->id, item->state); } else printf("SEPARATOR"); @@ -732,9 +732,9 @@ if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%u", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); printf("\n"); @@ -749,9 +749,9 @@ if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%u", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); }
Modified: branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/w... ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c (original) +++ branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c Mon Jan 15 01:36:14 2007 @@ -328,7 +328,7 @@ else { fprintf(stderr, "bisizel %d bosizel %d b4sizel %d\n", bisizel, bosizel, b4sizel); - yyerror("Invalid bitmap format, bih->biSize = %ld", bih->biSize); + yyerror("Invalid bitmap format, bih->biSize = %u", bih->biSize); }
switch(type) @@ -1045,7 +1045,7 @@ for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) { if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1053,7 +1053,7 @@ int n;
if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]);
@@ -1098,7 +1098,7 @@ mep->flags = BYTESWAP_WORD(mep->flags);
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1106,7 +1106,7 @@ int n;
if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]);
-
fireball＠svn.reactos.org