Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[greatlrd] 16601: /D /Z are implement in ros cmd copy by BrandonTurner but reactos CopyFile and CopyFileEx does not support it yet, for /D are COPY_FILE_ALLOW_DECRYPTED_DESTNATION for decypt the file when it copy to dest and /Z are COPY_FILE_RESTARTABLE for network. so it is working in windows

by greatlrd＠svn.reactos.com

/D /Z are implement in ros cmd copy by BrandonTurner but reactos CopyFile and CopyFileEx does not support it yet, for /D are COPY_FILE_ALLOW_DECRYPTED_DESTNATION for decypt the file when it copy to dest and /Z are COPY_FILE_RESTARTABLE for network. so it is working in windows Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-16 23:44:16 UTC (rev 16600) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-17 00:44:33 UTC (rev 16601) @@ -34,20 +34,20 @@ enum { - COPY_ASCII = 0x001, /* /A */ - COPY_DECRYPT = 0x004, /* /D : Not Impleneted */ + COPY_ASCII = 0x001, /* /A */ + COPY_DECRYPT = 0x004, /* /D */ COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */ COPY_SHORTNAME = 0x010, /* /N : Not Impleneted */ COPY_NO_PROMPT = 0x020, /* /Y */ COPY_PROMPT = 0x040, /* /-Y */ - COPY_RESTART = 0x080, /* /Z : Not Impleneted */ - COPY_BINARY = 0x100, /* /B */ + COPY_RESTART = 0x080, /* /Z */ + COPY_BINARY = 0x100, /* /B */ }; #define BUFF_SIZE 16384 /* 16k = max buffer size */ -int copy (LPTSTR source, LPTSTR dest, int append, DWORD lpdwFlags) +int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], int append, DWORD lpdwFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; FILETIME srctime; @@ -59,6 +59,9 @@ DWORD dwWritten; DWORD i; BOOL bEof = FALSE; + TCHAR TrueDest[MAX_PATH]; + TCHAR TempSrc[MAX_PATH]; + TCHAR * FileName; #ifdef _DEBUG DebugPrintf (_T("checking mode\n")); @@ -84,9 +87,46 @@ #ifdef _DEBUG DebugPrintf (_T("copy: flags has %s\n"), - *lpdwFlags & ASCII ? "ASCII" : "BINARY"); + *lpdwFlags & COPY_ASCII ? "ASCII" : "BINARY"); #endif + /* Check to see if /D or /Z are true, if so we need a middle + man to copy the file too to allow us to use CopyFileEx later */ + if(lpdwFlags & COPY_DECRYPT) + { + GetEnvironmentVariable(_T("TEMP"),TempSrc,MAX_PATH); + _tcscat(TempSrc,_T("\\")); + FileName = _tcsrchr(source,_T('\\')); + FileName++; + _tcscat(TempSrc,FileName); + /* This is needed to be on the end to prevent an error + if the user did "copy /D /Z foo bar then it would be copied + too %TEMP%\foo here and when %TEMP%\foo when it sets it up + for COPY_RESTART, this would mean it is copying to itself + which would error when it tried to open the handles for ReadFile + and WriteFile */ + _tcscat(TempSrc,_T(".decrypt")); + if(!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) + { + nErrorLevel = 1; + return 0; + } + _tcscpy(source, TempSrc); + } + + + if(lpdwFlags & COPY_RESTART) + { + _tcscpy(TrueDest, dest); + GetEnvironmentVariable(_T("TEMP"),dest,MAX_PATH); + _tcscat(dest,_T("\\")); + FileName = _tcsrchr(TrueDest,_T('\\')); + FileName++; + _tcscat(dest,FileName); + } + + + if (!IsExistingFile (dest)) { #ifdef _DEBUG @@ -216,6 +256,25 @@ #endif SetFileAttributes (dest, dwAttrib); + /* Now finish off the copy if needed with CopyFileEx */ + if(lpdwFlags & COPY_RESTART) + { + if(!CopyFileEx(dest, TrueDest, NULL, NULL, FALSE, COPY_FILE_RESTARTABLE)) + { + nErrorLevel = 1; + DeleteFile(dest); + return 0; + } + /* Take care of file in the temp folder */ + DeleteFile(dest); + + } + + if(lpdwFlags & COPY_DECRYPT) + DeleteFile(TempSrc); + + + return 1; }

19 years, 3 months

[greatlrd] 16600: add CopyFileEx flags #define COPY_FILE_ALLOW_DECRYPTED_DESTINATION, COPY_FILE_FAIL_IF_EXISTS, COPY_FILE_RESTARTABLE, COPY_FILE_OPEN_SOURCE_FOR_WRITE

by greatlrd＠svn.reactos.com

add CopyFileEx flags #define COPY_FILE_ALLOW_DECRYPTED_DESTINATION, COPY_FILE_FAIL_IF_EXISTS, COPY_FILE_RESTARTABLE, COPY_FILE_OPEN_SOURCE_FOR_WRITE Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-07-16 23:21:36 UTC (rev 16599) +++ trunk/reactos/w32api/include/winbase.h 2005-07-16 23:44:16 UTC (rev 16600) @@ -181,6 +181,10 @@ #define OPEN_EXISTING 3 #define OPEN_ALWAYS 4 #define TRUNCATE_EXISTING 5 +#define COPY_FILE_ALLOW_DECRYPTED_DESTINATION 0x00000008 +#define COPY_FILE_FAIL_IF_EXISTS 0x00000001 +#define COPY_FILE_RESTARTABLE 0x00000002 +#define COPY_FILE_OPEN_SOURCE_FOR_WRITE 0x00000004 #define FILE_FLAG_WRITE_THROUGH 0x80000000 #define FILE_FLAG_OVERLAPPED 1073741824 #define FILE_FLAG_NO_BUFFERING 536870912

19 years, 3 months

[ekohl] 16599: - For bugs for in-string parameters.

by ekohl＠svn.reactos.com

- For bugs for in-string parameters. - Implement out-string parameters (untested). Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-07-16 15:19:52 UTC (rev 16598) +++ trunk/reactos/tools/widl/ChangeLog 2005-07-16 23:21:36 UTC (rev 16599) @@ -1,12 +1,20 @@ ChangeLog -2004-05-08 weiden +2005-07-17 ekohl + tools/widl/client.c tools/widl/server.c +Fix bugs for in-string parameters. +Implement out-string parameters (untested). + +2005-05-08 weiden + + tools/widl/server.c + Don't generate lvalue assignment code. -2004-05-08 weiden +2005-05-08 weiden tools/widl/client.c tools/widl/proxy.c @@ -154,7 +162,7 @@ tools/widl/server.h tools/widl/client.h - tools/widl/proxy.h + tools/widl/proxy.h Deleted unneeded headers. _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-07-16 15:19:52 UTC (rev 16598) +++ trunk/reactos/tools/widl/client.c 2005-07-16 23:21:36 UTC (rev 16599) @@ -56,6 +56,130 @@ } +static unsigned int +get_var_stack_offset_32(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + if (var->type->type == RPC_FC_DOUBLE || + var->type->type == RPC_FC_HYPER) + offset += 8; + else + offset += 4; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_stack_offset_64(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + offset += 8; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_type_offset(var_t *var) +{ + unsigned int toffset = 0; + void *size_is_attr; + int string_attr; + + if (var->ptr_level == 0) + { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + toffset += tsize; + } + } + else if (var->ptr_level == 1) + { + size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + + if (size_is_attr) + { + if (string_attr) + { + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR) + toffset += 10; + } + else + { + if (is_base_type(var->type)) + toffset += 14; + } + } + else + { + if (is_base_type(var->type)) + toffset += 4; + } + } + + return toffset; +} + + +static type_t *get_type_by_name(func_t *func, char *name) +{ + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return var->type; + + var = PREV_LINK(var); + } + + return NULL; +} + + static unsigned char get_base_type(unsigned char type) { @@ -134,6 +258,45 @@ } +static int get_type_alignment(type_t *type) +{ + int size; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -281,9 +444,11 @@ { func_t *func = iface->funcs; var_t *var; + type_t *type; int in_attr, out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; + void *sizeis_attr; print_client("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); @@ -361,12 +526,59 @@ ptr_attr = is_attr(var->attrs, ATTR_PTR); ref_attr = is_attr(var->attrs, ATTR_REF); unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; - if (is_base_type(var->type)) + if (sizeis_attr && out_attr) { + unsigned char type_type = 0; + + type = get_type_by_name(func, ((expr_t *)sizeis_attr)->u.sval); + if (type != NULL) + type_type = type->type; + + print_client("0x11, 0x00, /* FC_RP */\n"); + print_client("NdrFcShort(0x02),\n"); + + if (string_attr) + { + if (var->type->type == RPC_FC_WCHAR) + print_client("0x25, /* FC_C_WSTRING */\n"); + else + print_client("0x22, /* FC_C_CSTRING */\n"); + print_client("0x44, /* FC_STRING_SIZED */\n"); + print_client("0x%02x,\n", 0x20 + type_type); + print_client("0x00,\n"); + + fprintf(client, "#ifndef _APLHA_\n"); + print_client("NdrFcShort(0x%02X),\n", + get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(client, "#else\n"); + print_client("NdrFcShort(0x%02X),\n", + get_var_stack_offset_64(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(client, "#endif\n"); + } + else + { + print_client("0x1b, /* FC_CARRAY */\n"); + print_client("0x%02x,\n", get_type_alignment(var->type) - 1); + print_client("NdrFcShort(0x%02x),\n", get_type_size(var->type, 1)); + print_client("0x%02x,\n", 0x20 + type_type); + print_client("0x00,\n"); + + fprintf(client, "#ifndef _APLHA_\n"); + print_client("NdrFcShort(0x04),\n"); + fprintf(client, "#else\n"); + print_client("NdrFcShort(0x08),\n"); + fprintf(client, "#endif\n"); + print_client("0x%02x,\n", get_base_type(var->type->type)); + print_client("0x5b, /* FC_END */\n"); + } + } + else if (is_base_type(var->type)) + { if (out_attr) print_client("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else @@ -401,8 +613,6 @@ } } - - func = PREV_LINK(func); } @@ -695,30 +905,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } if (nothing_printed) @@ -783,6 +970,8 @@ print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset + 2); indent--; fprintf(client, "\n"); + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); } else { @@ -946,30 +1135,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } @@ -980,6 +1146,8 @@ unsigned int size; unsigned int last_size = 0; int out_attr; + int string_attr; + void *sizeis_attr; var_t *var; var_t *def; unsigned int local_type_offset = *type_offset; @@ -994,6 +1162,9 @@ for (; var; var = PREV_LINK(var)) { out_attr = is_attr(var->attrs, ATTR_OUT); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + if (out_attr) { if (var->ptr_level > 1) @@ -1003,8 +1174,39 @@ return; } - if (is_base_type(var->type)) + if (sizeis_attr != NULL) { + if (string_attr) + { + fprintf(client, "\n"); + print_client("NdrConformantStringUnmarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + *type_offset + 4); + print_client("(unsigned char)0);\n"); + indent--; + fprintf(client, "\n"); + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); + } + else + { + fprintf(client, "\n"); + print_client("NdrConformantArrayUnmarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + *type_offset + 4); + print_client("(unsigned char)0);\n"); + indent--; + fprintf(client, "\n"); + } + } + else if (is_base_type(var->type)) + { alignment = 0; switch (var->type->type) { @@ -1095,30 +1297,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } @@ -1394,30 +1573,8 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; + type_offset += get_var_type_offset(var); - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - type_offset += 4; - } var = PREV_LINK(var); } } @@ -1596,30 +1753,7 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->ptr_level == 0) - { - if (var->type->type == RPC_FC_RP) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize ++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - size += tsize; - } - } - else if (var->ptr_level == 1) - { - if (is_base_type(var->type)) - size += 4; - } - + size += get_var_type_offset(var); var = PREV_LINK(var); } } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-07-16 15:19:52 UTC (rev 16598) +++ trunk/reactos/tools/widl/server.c 2005-07-16 23:21:36 UTC (rev 16599) @@ -61,6 +61,130 @@ } +static unsigned int +get_var_stack_offset_32(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + if (var->type->type == RPC_FC_DOUBLE || + var->type->type == RPC_FC_HYPER) + offset += 8; + else + offset += 4; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_stack_offset_64(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + offset += 8; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_type_offset(var_t *var) +{ + unsigned int toffset = 0; + void *size_is_attr; + int string_attr; + + if (var->ptr_level == 0) + { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + toffset += tsize; + } + } + else if (var->ptr_level == 1) + { + size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + + if (size_is_attr) + { + if (string_attr) + { + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR) + toffset += 10; + } + else + { + if (is_base_type(var->type)) + toffset += 14; + } + } + else + { + if (is_base_type(var->type)) + toffset += 4; + } + } + + return toffset; +} + + +static type_t *get_type_by_name(func_t *func, char *name) +{ + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return var->type; + + var = PREV_LINK(var); + } + + return NULL; +} + + static unsigned char get_base_type(unsigned char type) { @@ -139,6 +263,45 @@ } +static int get_type_alignment(type_t *type) +{ + int size; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -278,9 +441,11 @@ { func_t *func = iface->funcs; var_t *var; + type_t *type; int in_attr, out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; + void *sizeis_attr; print_server("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); @@ -358,12 +523,59 @@ ptr_attr = is_attr(var->attrs, ATTR_PTR); ref_attr = is_attr(var->attrs, ATTR_REF); unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; - if (is_base_type(var->type)) + if (sizeis_attr != NULL && out_attr) { + unsigned char type_type = 0; + + type = get_type_by_name(func, ((expr_t *)sizeis_attr)->u.sval); + if (type != NULL) + type_type = type->type; + + print_server("0x11, 0x00, /* FC_RP */\n"); + print_server("NdrFcShort(0x02),\n"); + + if (string_attr) + { + if (var->type->type == RPC_FC_WCHAR) + print_server("0x25, /* FC_C_WSTRING */\n"); + else + print_server("0x22, /* FC_C_CSTRING */\n"); + print_server("0x44, /* FC_STRING_SIZED */\n"); + print_server("0x%02x,\n", 0x20 + type_type); + print_server("0x00,\n"); + + fprintf(server, "#ifndef _APLHA_\n"); + print_server("NdrFcShort(0x%02X),\n", + get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(server, "#else\n"); + print_server("NdrFcShort(0x%02X),\n", + get_var_stack_offset_64(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(server, "#endif\n"); + } + else + { + print_server("0x1b, /* FC_CARRAY */\n"); + print_server("0x%02x,\n", get_type_alignment(var->type) - 1); + print_server("NdrFcShort(0x%02x),\n", get_type_size(var->type, 1)); + print_server("0x%02x,\n", 0x20 + type_type); + print_server("0x00,\n"); + + fprintf(server, "#ifndef _APLHA_\n"); + print_server("NdrFcShort(0x04),\n"); + fprintf(server, "#else\n"); + print_server("NdrFcShort(0x08),\n"); + fprintf(server, "#endif\n"); + print_server("0x%02x,\n", get_base_type(var->type->type)); + print_server("0x5b, /* FC_END */\n"); + } + } + else if (is_base_type(var->type)) + { if (out_attr) print_server("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else @@ -420,9 +632,11 @@ int in_attr; int out_attr; int string_attr; + void *sizeis_attr; int empty_line; var_t *var; + int add_return = 0; int start_new_line = 0; int add_plus = 0; @@ -437,10 +651,27 @@ for (; var; var = PREV_LINK(var)) { out_attr = is_attr(var->attrs, ATTR_OUT); + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + if (out_attr) { - if (is_base_type(var->type)) + if (var->ptr_level == 1 && + string_attr && + sizeis_attr != NULL && + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) { + fprintf(server, " 12U"); + add_return = 6; + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR) + add_return++; + add_plus = 1; + } + else if (is_base_type(var->type)) + { if (start_new_line) { print_server("_StubMsg.BufferLength +="); @@ -519,30 +750,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } } @@ -588,10 +796,60 @@ if (add_plus) fprintf(server, " +"); - fprintf(server, " %dU", (size == 0) ? 0 : size + alignment); + fprintf(server, " %dU", (size == 0) ? 0 : size + alignment + add_return); } fprintf(server, ";\n"); + + if (func->args) + { + local_type_offset = *type_offset; + + empty_line = 0; + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + for (; var; var = PREV_LINK(var)) + { + out_attr = is_attr(var->attrs, ATTR_OUT); + in_attr = is_attr(var->attrs, ATTR_IN); + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + + /* set 'in' attribute if neither 'in' nor 'out' is found */ + if (!out_attr && !in_attr) + in_attr = 1; + + if (out_attr) + { + if (var->ptr_level == 1 && + string_attr && + sizeis_attr != NULL && + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) + { + print_server("_StubMsg.MaxCount = %s;\n", ((expr_t *)sizeis_attr)->u.sval); + fprintf(server, "\n"); + print_server("NdrConformantStringBufferSize(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + indent--; + + empty_line = 1; + } + + /* calculate the next type offset */ + local_type_offset += get_var_type_offset(var); + } + } + + if (empty_line) + fprintf(server, "\n"); + } + /* get string size */ if (func->args) { @@ -610,7 +868,9 @@ if (var->ptr_level == 1 && string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) { print_server("_StubMsg.BufferLength += 16;\n"); empty_line = 1; @@ -645,9 +905,9 @@ } else if (var->ptr_level == 1) { - print_server("*("); + print_server("("); write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR *)&%s = 0;\n", var->name); + fprintf(server, " __RPC_FAR *)%s = 0;\n", var->name); } else if (var->ptr_level > 1) { @@ -711,6 +971,8 @@ print_server("(unsigned char)0);\n"); indent--; fprintf(server, "\n"); + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); } else { @@ -874,30 +1136,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } @@ -910,6 +1149,8 @@ var_t *var; var_t *def; int out_attr; + int string_attr; + void *sizeis_attr; unsigned int local_type_offset = *type_offset; def = func->def; @@ -924,8 +1165,30 @@ out_attr = is_attr(var->attrs, ATTR_OUT); if (out_attr) { - if (is_base_type(var->type)) + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + + if (sizeis_attr != NULL) { [truncated at 1000 lines; 306 more skipped]

19 years, 3 months

[hbirr] 16598: Merge r16567:16568 from trunk. This fix prevents from corrupting the message queues.

by hbirr＠svn.reactos.com

Merge r16567:16568 from trunk. This fix prevents from corrupting the message queues. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-16 13:01:18 UTC (rev 16597) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-16 15:19:52 UTC (rev 16598) @@ -1117,6 +1117,7 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->DispatchingListEntry); + Message->DispatchingListEntry.Flink = NULL; break; } Entry = Entry->Flink; @@ -1174,6 +1175,7 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->DispatchingListEntry); + Message->DispatchingListEntry.Flink = NULL; break; } Entry = Entry->Flink;

19 years, 3 months

[hbirr] 16597: Used the kernel base address from the loader structure instead MmSystemRangeStart.

by hbirr＠svn.reactos.com

Used the kernel base address from the loader structure instead MmSystemRangeStart. MmSystemRangeStart isn't the base address with the 3GB switch. Modified: trunk/reactos/hal/halx86/generic/halinit.c Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c Modified: trunk/reactos/hal/halx86/up/halinit_up.c Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c _____ Modified: trunk/reactos/hal/halx86/generic/halinit.c --- trunk/reactos/hal/halx86/generic/halinit.c 2005-07-16 12:35:34 UTC (rev 16596) +++ trunk/reactos/hal/halx86/generic/halinit.c 2005-07-16 13:01:18 UTC (rev 16597) @@ -38,7 +38,7 @@ if (BootPhase == 0) { RtlZeroMemory(&HalpHooks, sizeof(HALP_HOOKS)); - HalpInitPhase0(); + HalpInitPhase0(LoaderBlock); } else if (BootPhase == 1) { _____ Modified: trunk/reactos/hal/halx86/include/halp.h --- trunk/reactos/hal/halx86/include/halp.h 2005-07-16 12:35:34 UTC (rev 16596) +++ trunk/reactos/hal/halx86/include/halp.h 2005-07-16 13:01:18 UTC (rev 16597) @@ -38,7 +38,7 @@ PVOID HalpMapPhysMemory(ULONG PhysAddr, ULONG Size); /* Non-generic initialization */ -VOID HalpInitPhase0 (VOID); +VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); /* DMA Page Register Structure 080 DMA RESERVED _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-07-16 12:35:34 UTC (rev 16596) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-07-16 13:01:18 UTC (rev 16597) @@ -83,6 +83,8 @@ WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ }) +extern ULONG_PTR KernelBase; + /* FUNCTIONS *********************************************************************/ extern ULONG Read8254Timer(VOID); @@ -1035,7 +1037,7 @@ /* Write the page directory page */ Ke386GetPageTableDirectory(Common->PageDirectory); /* Write the kernel entry point */ - Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader(MmSystemRangeStart)->OptionalHeader.AddressO fEntryPoint + (ULONG_PTR)MmSystemRangeStart; + Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader((PVOID)KernelBase)->OptionalHeader.AddressOf EntryPoint + KernelBase; /* Write the state of the mae mode */ Common->PaeModeEnabled = Ke386GetCr4() & X86_CR4_PAE ? 1 : 0; _____ Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c --- trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-07-16 12:35:34 UTC (rev 16596) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-07-16 13:01:18 UTC (rev 16597) @@ -18,10 +18,11 @@ /* FUNCTIONS ***************************************************************/ extern BOOLEAN HaliFindSmpConfig(VOID); +ULONG_PTR KernelBase; /*********************************************************************** ****/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { static BOOLEAN MPSInitialized = FALSE; @@ -29,7 +30,7 @@ /* Only initialize MP system once. Once called the first time, each subsequent call is part of the initialization sequence - for an application processor. */ + for an application processor. */ DPRINT("HalpInitPhase0()\n"); @@ -45,6 +46,10 @@ { KEBUGCHECK(0); } + + /* store the kernel base for later use */ + KernelBase = ((PLOADER_MODULE)LoaderBlock->ModsAddr)[0].ModStart; + } /* EOF */ _____ Modified: trunk/reactos/hal/halx86/up/halinit_up.c --- trunk/reactos/hal/halx86/up/halinit_up.c 2005-07-16 12:35:34 UTC (rev 16596) +++ trunk/reactos/hal/halx86/up/halinit_up.c 2005-07-16 13:01:18 UTC (rev 16597) @@ -18,7 +18,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpInitPICs(); _____ Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2005-07-16 12:35:34 UTC (rev 16596) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2005-07-16 13:01:18 UTC (rev 16597) @@ -22,7 +22,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpHooks.InitPciBus = HalpXboxInitPciBus;

19 years, 3 months

[hbirr] 16596: Replaced KERNEL_BASE by MmSystemRangeStart.

by hbirr＠svn.reactos.com

Replaced KERNEL_BASE by MmSystemRangeStart. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/mm/marea.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-07-16 12:18:16 UTC (rev 16595) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-07-16 12:35:34 UTC (rev 16596) @@ -469,7 +469,7 @@ * Complete CPU context */ { - unsigned int cr2; + ULONG_PTR cr2; NTSTATUS Status; ULONG Esp0; @@ -528,7 +528,7 @@ */ if (ExceptionNr == 14) { - if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= KERNEL_BASE) + if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= (ULONG_PTR)MmSystemRangeStart) { KEBUGCHECKWITHTF(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, 0, 0, 0, 0, Tf); } _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-07-16 12:18:16 UTC (rev 16595) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-07-16 12:35:34 UTC (rev 16596) @@ -971,7 +971,7 @@ *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); if (AddressSpace->LowestAddress == MmSystemRangeStart && - *BaseAddress < (PVOID)KERNEL_BASE) + *BaseAddress < MmSystemRangeStart) { CHECKPOINT; return STATUS_ACCESS_VIOLATION;

19 years, 3 months

[greatlrd] 16595: crop mf logo to 30x280 and it showing right rember do not design higher that 280 on the startmenu logo change.

by greatlrd＠svn.reactos.com

crop mf logo to 30x280 and it showing right rember do not design higher that 280 on the startmenu logo change. Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp Modified: trunk/reactos/subsys/system/explorer/res/logov256.bmp _____ Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/logov256.bmp (Binary files differ)

19 years, 3 months

[jc] 16594: GetMenuStringA and GetMenuStringW inverted the MF_BYPOSITION parameter. Buffers were incorrectly copied in and wrong size returned in GetMenuItemInfoA ansi-structures.

by jc＠svn.reactos.com

GetMenuStringA and GetMenuStringW inverted the MF_BYPOSITION parameter. Buffers were incorrectly copied in and wrong size returned in GetMenuItemInfoA ansi-structures. GetMenuString now works the same on both windows and ROS. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-16 10:23:10 UTC (rev 16593) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-16 11:45:28 UTC (rev 16594) @@ -3772,7 +3772,7 @@ RtlCopyMemory(mii, &miiW, miiW.cbSize); mii->dwTypeData = AnsiBuffer; - + mii->cch = strlen(AnsiBuffer); return TRUE; } @@ -3864,11 +3864,11 @@ MENUITEMINFOA mii; mii.dwTypeData = lpString; mii.fMask = MIIM_STRING; + mii.fType = MF_STRING; mii.cbSize = sizeof(MENUITEMINFOA); mii.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&mii))) + if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&mii))) return 0; else return mii.cch; @@ -3893,10 +3893,9 @@ miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&miiW))) + if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&miiW))) return 0; - else + else return miiW.cch; } @@ -4318,11 +4317,11 @@ mii.fState = MFS_ENABLED; UNIMPLEMENTED; - + if(!GetMenuItemInfoA( hMnu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), - &mii)) return FALSE; + &mii)) return FALSE; if(uFlags & MF_BITMAP) { @@ -4341,7 +4340,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } /* Item beginning with a backspace is a help item */ if (*lpNewItem == '\b') { @@ -4352,7 +4351,7 @@ mii.dwTypeData = (LPSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY; @@ -4439,7 +4438,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } if (*lpNewItem == '\b') { mii.fType |= MF_HELP; @@ -4449,7 +4448,7 @@ mii.dwTypeData = (LPWSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY;

19 years, 3 months

[mbosma] 16593: HUMA2000: Spanish translation

by mbosma＠svn.reactos.com

HUMA2000: Spanish translation Modified: trunk/rosapps/packmgr/lib/es.rc _____ Modified: trunk/rosapps/packmgr/lib/es.rc --- trunk/rosapps/packmgr/lib/es.rc 2005-07-16 09:01:07 UTC (rev 16592) +++ trunk/rosapps/packmgr/lib/es.rc 2005-07-16 10:23:10 UTC (rev 16593) @@ -1,4 +1,3 @@ - LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* String Tables */ @@ -15,11 +14,11 @@ ERR_CALL "Error durante la ejecuci¾n del Script.\nNo se pudo encontrar la funci¾n." ERR_PARAMETER "Error durante la ejecuci¾n del Script.\nParametro(s) err¾neo." - ERR_DEP1 "To install this package you have to install the following package(s) as well:\n\n" - ERR_DEP2 "\nDo you want this ?" - ERR_READY "You choosen to install %d package(s). To install them you have to read and agree with each of thier licences.\n\n Do you want still want to ?" + ERR_DEP1 "Para instalar este paquete debes instalar tambiÚn los siguientes paquetes:\n\n" + ERR_DEP2 "\n?Seguro que quieres ahcer eso?" + ERR_READY "Has seleccionado instalar %d paquete(s). Para instalarlos debes leer y estar deacuerdo con cada uno de sus licencias.\n\n ?Sigues queriendo hacerlo?" END 123 RCDATA "options.xml" -/* EOF */ +/* EOF */ \ No newline at end of file

19 years, 3 months

[hbirr] 16592: - Fixed the size of the hyperspace area (thanks to Filip Navara).

by hbirr＠svn.reactos.com

- Fixed the size of the hyperspace area (thanks to Filip Navara). - Enabled Pae mode in freeldr if it is requested. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S --- trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S 2005-07-15 19:15:59 UTC (rev 16591) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S 2005-07-16 09:01:07 UTC (rev 16592) @@ -72,7 +72,7 @@ .fill 2*4096, 1, 0 _hyperspace_pagetable: - .fill 2*4096, 1, 0 + .fill 4096, 1, 0 _apic_pagetable: .fill 4096, 1, 0 _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c --- trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-07-15 19:15:59 UTC (rev 16591) +++ trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-07-16 09:01:07 UTC (rev 16592) @@ -279,11 +279,32 @@ FASTCALL FrLdrGetPaeMode(VOID) { - /* FIXME: Read command line */ + PCHAR p; + PaeModeEnabled = FALSE; + /* Read Command Line */ + p = (PCHAR)LoaderBlock.CommandLine; + while ((p = strchr(p, '/')) != NULL) { + + p++; + /* Find "PAE" */ + if (!strnicmp(p, "PAE", 3)) { + + /* Make sure there's nothing following it */ + if (p[3] == ' ' || p[3] == 0) { + + /* Use Pae */ + PaeModeEnabled = TRUE; + break; + } + } + } if (PaeModeEnabled) { + /* FIXME: + * Check if the cpu is pae capable + */ } } @@ -445,9 +466,6 @@ PageDir->Pde[HyperspacePageTableIndex].Valid = 1; PageDir->Pde[HyperspacePageTableIndex].Write = 1; PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); - PageDir->Pde[HyperspacePageTableIndex + 1].Valid = 1; - PageDir->Pde[HyperspacePageTableIndex + 1].Write = 1; - PageDir->Pde[HyperspacePageTableIndex + 1].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable + 4096); /* Set up the Apic PDE */ PageDir->Pde[ApicPageTableIndex].Valid = 1; _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-15 19:15:59 UTC (rev 16591) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-16 09:01:07 UTC (rev 16592) @@ -40,7 +40,7 @@ #define PAE_PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (512))) #define HYPERSPACE (Ke386Pae ? 0xc0800000 : 0xc0400000) -#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < 0xc0c00000)) +#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < HYPERSPACE + 0x400000)) ULONG MmGlobalKernelPageDirectory[1024]; ULONGLONG MmGlobalKernelPageDirectoryForPAE[2048]; @@ -2371,32 +2371,41 @@ MEMORY_AREA* hyperspace_desc = NULL; PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID BaseAddress; + NTSTATUS Status; DPRINT("MiInitPageDirectoryMap()\n"); BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGETABLE_MAP; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Ke386Pae ? 0x800000 : 0x400000, - 0, - &kernel_map_desc, - TRUE, - FALSE, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(NULL, + MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + Ke386Pae ? 0x800000 : 0x400000, + 0, + &kernel_map_desc, + TRUE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } BaseAddress = (PVOID)HYPERSPACE; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Ke386Pae ? 0x400000 : 0x800000, - 0, - &hyperspace_desc, - TRUE, - FALSE, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(NULL, + MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + 0x400000, + 0, + &hyperspace_desc, + TRUE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } } /* EOF */

19 years, 3 months

← Newer
1
...
30
31
32
33
34
35
36
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005