- Merge 25373

- Merge 25396 (only the part related to semgr.c file)
- Merge 25399

svn path=/branches/ros-branch-0_3_1/; revision=25460

diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c
index b4364bb..fcbb210 100644 (file)
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -1054,7 +1054,7 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
     }
   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 */

diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
index 9a57c8f..057fe60 100644 (file)
--- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
+++ b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
@@ -302,24 +302,29 @@ CBBackend::_generate_workspace ( FILE* OUT )
        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() )
+
+               if ((module.type != Iso) && 
+                       (module.type != LiveIso) &&
+                       (module.type != IsoRegTest) &&
+                       (module.type != LiveIsoRegTest))
                {
-                       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" );
-       
+                       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" );

diff --git a/reactos/tools/winebuild/build.h b/reactos/tools/winebuild/build.h
index 7f66b5b..c5c646b 100644 (file)
--- a/reactos/tools/winebuild/build.h
+++ b/reactos/tools/winebuild/build.h
@@ -220,6 +220,8 @@ extern void BuildPedllFile( FILE *outfile, DLLSPEC *spec );
 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;

diff --git a/reactos/tools/wrc/dumpres.c b/reactos/tools/wrc/dumpres.c
index 7af89e4..a121189 100644 (file)
--- a/reactos/tools/wrc/dumpres.c
+++ b/reactos/tools/wrc/dumpres.c
@@ -203,12 +203,12 @@ static void dump_lvc(const lvc_t *l)
                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 @@ static void dump_control(const control_t *ctrl)
        {
                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 @@ static void dump_dialog(const dialog_t *dlg)
        {
                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 @@ static void dump_dialogex(const dialogex_t *dlgex)
        {
                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 @@ static void dump_menu_item(const menu_item_t *item)
                        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 @@ static void dump_menuex_item(const menuex_item_t *item)
                        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 @@ static void dump_menuex_item(const menuex_item_t *item)
                                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);
                        }

diff --git a/reactos/tools/wrc/newstruc.c b/reactos/tools/wrc/newstruc.c
index 5d3ce95..8589b3c 100644 (file)
--- a/reactos/tools/wrc/newstruc.c
+++ b/reactos/tools/wrc/newstruc.c
@@ -328,7 +328,7 @@ static int convert_bitmap(char *data, int size)
        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 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
                        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 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
                                        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 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
                                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 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
                                        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]);