Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 11:33:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Merge 25373

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

svn path=/branches/ros-branch-0_3_1/; revision=25460
This commit is contained in:
Aleksey Bragin 2007-01-14 22:36:14 +00:00
parent b8f9ed5ea8
commit 1a17bce83b
5 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/ntoskrnl/se/semgr.c
View file

@ -1054,7 +1054,7 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
} }
else else
{ {
*AccessStatus = STATUS_ACCESS_DENIED; *AccessStatus = STATUS_SUCCESS;
DPRINT("FIX caller rights (granted 0x%lx, desired 0x%lx)!\n", DPRINT("FIX caller rights (granted 0x%lx, desired 0x%lx)!\n",
*GrantedAccess, DesiredAccess); *GrantedAccess, DesiredAccess);
return TRUE; /* FIXME: should be FALSE */ return TRUE; /* FIXME: should be FALSE */

39
reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
View file

@ -302,24 +302,29 @@ CBBackend::_generate_workspace ( FILE* OUT )
for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )
{ {
Module& module = *ProjectNode.modules[i]; Module& module = *ProjectNode.modules[i];
std::string Cbp_file = CbpFileName ( module ); if ((module.type != Iso) &&
fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); (module.type != LiveIso) &&
(module.type != IsoRegTest) &&
/* dependencies */ (module.type != LiveIsoRegTest))
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(); std::string Cbp_file = CbpFileName ( module );
ifs_list.pop_back(); fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str());
const vector<Library*>& libs = data.libraries;
for ( size_t j = 0; j < libs.size(); j++ ) /* dependencies */
fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); vector<const IfableData*> ifs_list;
} ifs_list.push_back ( &module.project.non_if_data );
fprintf ( OUT, "\t\t</Project>\r\n" ); 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, "\t</Workspace>\r\n" );
fprintf ( OUT, "</CodeBlocks_workspace_file>\r\n" ); fprintf ( OUT, "</CodeBlocks_workspace_file>\r\n" );

2
reactos/tools/winebuild/build.h
View file

@ -220,6 +220,8 @@ extern void BuildPedllFile( FILE *outfile, DLLSPEC *spec );
extern int parse_spec_file( FILE *file, DLLSPEC *spec ); extern int parse_spec_file( FILE *file, DLLSPEC *spec );
extern int parse_def_file( FILE *file, DLLSPEC *spec ); extern int parse_def_file( FILE *file, DLLSPEC *spec );
extern int mkstemps(char *template, int suffix_len);
/* global variables */ /* global variables */
extern int current_line; extern int current_line;

30
reactos/tools/wrc/dumpres.c
View file

@ -203,12 +203,12 @@ static void dump_lvc(const lvc_t *l)
printf("LANGUAGE <not set>\n"); printf("LANGUAGE <not set>\n");
if(l->version) if(l->version)
printf("VERSION %08lx\n", *(l->version)); printf("VERSION %08x\n", *(l->version));
else else
printf("VERSION <not set>\n"); printf("VERSION <not set>\n");
if(l->characts) if(l->characts)
printf("CHARACTERISTICS %08lx\n", *(l->characts)); printf("CHARACTERISTICS %08x\n", *(l->characts));
else else
printf("CHARACTERISTICS <not set>\n"); printf("CHARACTERISTICS <not set>\n");
} }
@ -537,16 +537,16 @@ static void dump_control(const control_t *ctrl)
{ {
assert(ctrl->style != NULL); assert(ctrl->style != NULL);
assert(ctrl->style->and_mask == 0); 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) if(ctrl->gotexstyle)
{ {
assert(ctrl->exstyle != NULL); assert(ctrl->exstyle != NULL);
assert(ctrl->exstyle->and_mask == 0); 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) if(ctrl->gothelpid)
printf("\tHelpid: %ld\n", ctrl->helpid); printf("\tHelpid: %u\n", ctrl->helpid);
if(ctrl->extra) if(ctrl->extra)
{ {
printf("\t"); printf("\t");
@ -577,14 +577,14 @@ static void dump_dialog(const dialog_t *dlg)
{ {
assert(dlg->style != NULL); assert(dlg->style != NULL);
assert(dlg->style->and_mask == 0); 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) if(dlg->gotexstyle)
{ {
assert(dlg->exstyle != NULL); assert(dlg->exstyle != NULL);
assert(dlg->exstyle->and_mask == 0); 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("Menu: %s\n", get_nameid_str(dlg->menu));
printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); 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 != NULL);
assert(dlgex->style->and_mask == 0); 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) if(dlgex->gotexstyle)
{ {
assert(dlgex->exstyle != NULL); assert(dlgex->exstyle != NULL);
assert(dlgex->exstyle->and_mask == 0); 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) 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("Menu: %s\n", get_nameid_str(dlgex->menu));
printf("Class: %s\n", get_nameid_str(dlgex->dlgclass)); printf("Class: %s\n", get_nameid_str(dlgex->dlgclass));
printf("Title: "); print_string(dlgex->title); printf("\n"); 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) if(item->name)
{ {
print_string(item->name); print_string(item->name);
printf(", %d, %08lx", item->id, item->state); printf(", %d, %08x", item->id, item->state);
} }
else else
printf("SEPARATOR"); printf("SEPARATOR");
@ -732,9 +732,9 @@ static void dump_menuex_item(const menuex_item_t *item)
if(item->gotid) if(item->gotid)
printf(", Id=%d", item->id); printf(", Id=%d", item->id);
if(item->gottype) if(item->gottype)
printf(", Type=%ld", item->type); printf(", Type=%u", item->type);
if(item->gotstate) if(item->gotstate)
printf(", State=%08lx", item->state); printf(", State=%08x", item->state);
if(item->gothelpid) if(item->gothelpid)
printf(", HelpId=%d", item->helpid); printf(", HelpId=%d", item->helpid);
printf("\n"); printf("\n");
@ -749,9 +749,9 @@ static void dump_menuex_item(const menuex_item_t *item)
if(item->gotid) if(item->gotid)
printf(", Id=%d", item->id); printf(", Id=%d", item->id);
if(item->gottype) if(item->gottype)
printf(", Type=%ld", item->type); printf(", Type=%u", item->type);
if(item->gotstate) if(item->gotstate)
printf(", State=%08lx", item->state); printf(", State=%08x", item->state);
if(item->gothelpid) if(item->gothelpid)
printf(", HelpId=%d", item->helpid); printf(", HelpId=%d", item->helpid);
} }

10
reactos/tools/wrc/newstruc.c
View file

@ -328,7 +328,7 @@ static int convert_bitmap(char *data, int size)
else else
{ {
fprintf(stderr, "bisizel %d bosizel %d b4sizel %d\n", bisizel, bosizel, b4sizel); 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) 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++) for(id = mbp[i].idlo; id <= mbp[i].idhi; id++)
{ {
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) 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 */ if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */
{ {
WORD *wp = (WORD *)&mep[1]; WORD *wp = (WORD *)&mep[1];
@ -1053,7 +1053,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
int n; int n;
if(mep->length & 1) 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++) for(n = 0; n < l; n++)
wp[n] = BYTESWAP_WORD(wp[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); mep->flags = BYTESWAP_WORD(mep->flags);
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) 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 */ if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */
{ {
WORD *wp = (WORD *)&mep[1]; WORD *wp = (WORD *)&mep[1];
@ -1106,7 +1106,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
int n; int n;
if(mep->length & 1) 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++) for(n = 0; n < l; n++)
wp[n] = BYTESWAP_WORD(wp[n]); wp[n] = BYTESWAP_WORD(wp[n]);