Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[tkreuzer] 37492: Implement RtlpTryToUnwindEpilog, which tries to unwind a function, if we are in the epilog by parsing the allowed opcodes.
by tkreuzer＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: tkreuzer Date: Thu Nov 20 15:55:44 2008 New Revision: 37492 URL: http://svn.reactos.org/svn/reactos?rev=37492&view=rev Log: Implement RtlpTryToUnwindEpilog, which tries to unwind a function, if we are in the epilog by parsing the allowed opcodes. Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Thu Nov 20 15:55:44 2008 @@ -163,10 +163,146 @@ void FORCEINLINE -SetReg(PCONTEXT Context, UCHAR Reg, ULONG64 Value) -{ - ((PULONG64)(&Context->Rax))[Reg] = Value; -} +SetReg(PCONTEXT Context, BYTE Reg, DWORD64 Value) +{ + ((DWORD64*)(&Context->Rax))[Reg] = Value; +} + +DWORD64 +FORCEINLINE +GetReg(PCONTEXT Context, BYTE Reg) +{ + return ((DWORD64*)(&Context->Rax))[Reg]; +} + +void +FORCEINLINE +PopReg(PCONTEXT Context, BYTE Reg) +{ + DWORD64 Value = *(DWORD64*)Context->Rsp; + Context->Rsp += 8; + SetReg(Context, Reg, Value); +} + +/* Helper function that tries to unwind epilog instructions. + * Returns TRUE we have been in an epilog and it could be unwound. + * FALSE if the instructions were not allowed for an epilog. + * References: + * http://msdn.microsoft.com/en-us/library/8ydc79k6(VS.80).aspx + * http://msdn.microsoft.com/en-us/library/tawsa7cb.aspx + * TODO: + * - Test and compare with Windows behaviour + */ +BOOLEAN +static +inline +RtlpTryToUnwindEpilog( + PCONTEXT Context, + ULONG64 ImageBase, + PRUNTIME_FUNCTION FunctionEntry) +{ + CONTEXT LocalContext; + BYTE *InstrPtr; + DWORD Instr; + BYTE Reg, Mod; + ULONG64 EndAddress; + + /* Make a local copy of the context */ + LocalContext = *Context; + + InstrPtr = (BYTE*)LocalContext.Rip; + + /* Check if first instruction of epilog is "add rsp, x" */ + Instr = *(DWORD*)InstrPtr; + if ( (Instr & 0x00fffdff) == 0x00c48148 ) + { + if ( (Instr & 0x0000ff00) == 0x8300 ) + { + /* This is "add rsp, 0x??" */ + LocalContext.Rsp += Instr >> 24; + InstrPtr += 4; + } + else + { + /* This is "add rsp, 0x???????? */ + LocalContext.Rsp += *(DWORD*)(InstrPtr + 3); + InstrPtr += 7; + } + } + /* Check if first instruction of epilog is "lea rsp, ..." */ + else if ( (Instr & 0x38fffe) == 0x208d48 ) + { + /* Get the register */ + Reg = ((Instr << 8) | (Instr >> 16)) & 0x7; + + LocalContext.Rsp = GetReg(&LocalContext, Reg); + + /* Get adressing mode */ + Mod = (Instr >> 22) & 0x3; + if (Mod == 0) + { + /* No displacement */ + InstrPtr += 3; + } + else if (Mod == 1) + { + /* 1 byte displacement */ + LocalContext.Rsp += Instr >> 24; + InstrPtr += 4; + } + else if (Mod == 2) + { + /* 4 bytes displacement */ + LocalContext.Rsp += *(DWORD*)(InstrPtr + 3); + InstrPtr += 7; + } + } + + /* Loop the following instructions */ + EndAddress = FunctionEntry->EndAddress + ImageBase; + while((DWORD64)InstrPtr < EndAddress) + { + Instr = *(DWORD*)InstrPtr; + + /* Check for a simple pop */ + if ( (Instr & 0xf8) == 0x58 ) + { + /* Opcode pops a basic register from stack */ + Reg = Instr & 0x7; + PopReg(&LocalContext, Reg); + InstrPtr++; + continue; + } + + /* Check for REX + pop */ + if ( (Instr & 0xf8fb) == 0x5841 ) + { + /* Opcode is pop r8 .. r15 */ + Reg = (Instr & 0x7) + 8; + PopReg(&LocalContext, Reg); + InstrPtr += 2; + continue; + } + + /* Check for retn / retf */ + if ( (Instr & 0xf7) == 0xc3 ) + { + /* We are finished */ + break; + } + + /* Opcode not allowed for Epilog */ + return FALSE; + } + + /* Unwind is finished, pop new Rip from Stack */ + LocalContext.Rip = *(DWORD64*)LocalContext.Rsp; + LocalContext.Rsp += sizeof(DWORD64); + + *Context = LocalContext; + return TRUE; +} + PEXCEPTION_ROUTINE NTAPI @@ -184,7 +320,7 @@ ULONG CodeOffset; ULONG i; UNWIND_CODE UnwindCode; - UCHAR Reg; + BYTE Reg; /* Use relative virtual address */ ControlPc -= ImageBase; @@ -201,6 +337,16 @@ /* Calculate relative offset to function start */ CodeOffset = ControlPc - FunctionEntry->BeginAddress; + + /* Check if we are in the function epilog and try to finish it */ + if (CodeOffset > UnwindInfo->SizeOfProlog) + { + if (RtlpTryToUnwindEpilog(Context, ImageBase, FunctionEntry)) + { + /* There's no exception routine */ + return NULL; + } + } /* Skip all Ops with an offset greater than the current Offset */ i = 0;

1 0

[ekohl] 37491: SySync to wine-1.1.1 (Patch 6 of 10): - Rob Shearman <robertshearman@gmail.com> Thu, 3 Jul 2008 widl: Consolidate top-level parameter conformance/variance expression writing into a separate function. Descend through as many pointer types as necessary to find the fundamental type and determine whether it needs a top-level parameter conformance/variance expression to be written. Add support for writing top-level parameter conformance/variance expressions for non-encapsulated unions.
by ekohl＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: ekohl Date: Thu Nov 20 14:37:09 2008 New Revision: 37491 URL: http://svn.reactos.org/svn/reactos?rev=37491&view=rev Log: SySync to wine-1.1.1 (Patch 6 of 10): - Rob Shearman <robertshearman(a)gmail.com> Thu, 3 Jul 2008 widl: Consolidate top-level parameter conformance/variance expression writing into a separate function. Descend through as many pointer types as necessary to find the fundamental type and determine whether it needs a top-level parameter conformance/variance expression to be written. Add support for writing top-level parameter conformance/variance expressions for non-encapsulated unions. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Thu Nov 20 14:37:09 2008 @@ -2770,7 +2770,7 @@ /* returns whether the MaxCount, Offset or ActualCount members need to be * filled in for the specified phase */ -static inline int is_size_needed_for_phase(enum remoting_phase phase) +static inline int is_conformance_needed_for_phase(enum remoting_phase phase) { return (phase != PHASE_UNMARSHAL); } @@ -2791,6 +2791,67 @@ } return x; +} + +static void write_parameter_conf_or_var_exprs(FILE *file, int indent, + enum remoting_phase phase, + const var_t *var) +{ + const type_t *type = var->type; + /* get fundamental type for the argument */ + for (;;) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + break; + else if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + break; + else if (is_array(type) || is_string_type(var->attrs, type)) + { + if (is_conformance_needed_for_phase(phase)) + { + if (type->size_is) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, type->size_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + if (type->length_is) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, type->length_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + } + break; + } + else if (type->type == RPC_FC_NON_ENCAPSULATED_UNION) + { + if (is_conformance_needed_for_phase(phase)) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, get_attrp(var->attrs, ATTR_SWITCHIS), 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + break; + } + else if (type->type == RPC_FC_IP) + { + expr_t *iid; + + if (is_conformance_needed_for_phase(phase) && (iid = get_attrp( var->attrs, ATTR_IIDIS ))) + { + print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); + write_expr( file, iid, 1, 1, NULL, NULL ); + fprintf( file, ";\n\n" ); + } + break; + } + else if (is_ptr(type)) + type = type->ref; + else + break; + } } static void write_remoting_arg(FILE *file, int indent, const func_t *func, @@ -2824,6 +2885,7 @@ break; } + write_parameter_conf_or_var_exprs(file, indent, phase, var); rtype = type->type; if (is_context_handle(type)) @@ -2879,13 +2941,6 @@ print_phase_function(file, indent, "NonConformantString", phase, var, start_offset); else { - if (type->size_is && is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n"); - } - if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type == RPC_FC_UP) print_phase_function(file, indent, "Pointer", phase, var, start_offset - (type->size_is ? 4 : 2)); @@ -2908,43 +2963,14 @@ if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) { - if (is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } array_type = "VaryingArray"; } else if (tc == RPC_FC_CARRAY) { - if (is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } array_type = "ConformantArray"; } else if (tc == RPC_FC_CVARRAY || tc == RPC_FC_BOGUS_ARRAY) { - if (is_size_needed_for_phase(phase)) - { - if (type->size_is) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n"); - } - if (type->length_is) - { - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } - } array_type = (tc == RPC_FC_BOGUS_ARRAY ? "ComplexArray" : "ConformantVaryingArray"); @@ -3029,21 +3055,6 @@ } else { - expr_t *iid; - expr_t *sx = get_size_is_expr(type, var->name); - - if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) - { - print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); - write_expr( file, iid, 1, 1, NULL, NULL ); - fprintf( file, ";\n\n" ); - } - else if (sx) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long) "); - write_expr(file, sx, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } if (var->type->ref->type == RPC_FC_IP) print_phase_function(file, indent, "InterfacePointer", phase, var, start_offset); else

1 0

[fireball] 37490: - Upcase a search expression when calling RtlIsNameInExpression with case-insensitive option (a merge of 37263 from Pierre's branch with changed comments).
by fireball＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: fireball Date: Thu Nov 20 14:24:10 2008 New Revision: 37490 URL: http://svn.reactos.org/svn/reactos?rev=37490&view=rev Log: - Upcase a search expression when calling RtlIsNameInExpression with case-insensitive option (a merge of 37263 from Pierre's branch with changed comments). Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Thu Nov 20 14:24:10 2008 @@ -166,6 +166,7 @@ UNICODE_STRING TempString; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; PVOID Block; NTSTATUS Status; ULONG len; @@ -263,6 +264,13 @@ Record = (PDIR_RECORD)((ULONG_PTR)Record + Record->RecordLength); } + /* Upper case the expression for FsRtlIsNameInExpression */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", @@ -307,8 +315,8 @@ DPRINT("ShortName '%wZ'\n", &ShortName); - if (FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) + if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) { if (Parent && Parent->PathName) { @@ -347,6 +355,7 @@ DPRINT("FindFile: new Pathname %S, new Objectname %S, DirIndex %d\n", Fcb->PathName, Fcb->ObjectName, DirIndex); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_SUCCESS; @@ -357,6 +366,7 @@ DirIndex++; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); if (pDirIndex) Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Thu Nov 20 14:24:10 2008 @@ -464,6 +464,7 @@ WCHAR ShortNameBuffer[13]; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; BOOLEAN HasSpaces; GENERATE_NAME_CONTEXT NameContext; @@ -502,6 +503,14 @@ Offset = 0; BlockOffset = 0; Record = (PDIR_RECORD)Block; + + /* Upper case the expression for FsRtlIsNameInExpression */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { if (Record->RecordLength == 0) @@ -543,8 +552,8 @@ DPRINT("ShortName '%wZ'\n", &ShortName); - if (FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) + if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) { DPRINT("Match found, %S\n", Name); Status = CdfsMakeFCBFromDirEntry(DeviceExt, @@ -556,6 +565,7 @@ Offset, FoundFCB); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return(Status); @@ -578,6 +588,7 @@ &Context, &Block)) { DPRINT("CcMapData() failed\n"); + RtlFreeUnicodeString(&FileToFindUpcase); return(STATUS_UNSUCCESSFUL); } Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); @@ -587,6 +598,7 @@ break; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return(STATUS_OBJECT_NAME_NOT_FOUND);

1 0

[ekohl] 37489: SySync to wine-1.1.1 (Patch 5 of 10): - Dan Hipschman <dsh@linux.ucla.edu> Tue, 1 Jul 2008 widl: Factor a small part of the grammar.
by ekohl＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: ekohl Date: Thu Nov 20 14:21:33 2008 New Revision: 37489 URL: http://svn.reactos.org/svn/reactos?rev=37489&view=rev Log: SySync to wine-1.1.1 (Patch 5 of 10): - Dan Hipschman <dsh(a)linux.ucla.edu> Tue, 1 Jul 2008 widl: Factor a small part of the grammar. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37…

1 0

[fireball] 37488: - Merge misaligned reads support (35998, 36834 by Art) from arty-newcc branch.
by fireball＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: fireball Date: Thu Nov 20 14:02:36 2008 New Revision: 37488 URL: http://svn.reactos.org/svn/reactos?rev=37488&view=rev Log: - Merge misaligned reads support (35998, 36834 by Art) from arty-newcc branch. Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Thu Nov 20 14:02:36 2008 @@ -76,14 +76,23 @@ { LARGE_INTEGER FileOffset; IO_STATUS_BLOCK IoStatus; + CC_FILE_SIZES FileSizes; if (ReadOffset + Length > Fcb->Entry.DataLengthL) Length = Fcb->Entry.DataLengthL - ReadOffset; if (FileObject->PrivateCacheMap == NULL) { + FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; + FileSizes.FileSize = Fcb->RFCB.FileSize; + FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; + + DPRINT("Attach FCB to File: Size %08x%08x\n", + Fcb->RFCB.ValidDataLength.HighPart, + Fcb->RFCB.ValidDataLength.LowPart); + CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + &FileSizes, FALSE, &(CdfsGlobalData->CacheMgrCallbacks), Fcb); @@ -103,25 +112,65 @@ if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) { - return STATUS_INVALID_PARAMETER; - } - - if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) - Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; - - Status = CdfsReadSectors(DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), - Length / BLOCKSIZE, - Buffer, - FALSE); - if (NT_SUCCESS(Status)) - { - *LengthRead = Length; - if (Length + ReadOffset > Fcb->Entry.DataLengthL) - { - memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, - 0, - Length + ReadOffset - Fcb->Entry.DataLengthL); + /* Then we need to do a partial or misaligned read ... */ + PVOID PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE); + PCHAR ReadInPage = (PCHAR)PageBuf + (ReadOffset & (BLOCKSIZE - 1)); + PCHAR TargetRead = (PCHAR)Buffer; + ULONG ActualReadOffset, EndOfExtent, ReadLen; + + if (!PageBuf) + { + return STATUS_NO_MEMORY; + } + + ActualReadOffset = ReadOffset & ~(BLOCKSIZE - 1); + EndOfExtent = ReadOffset + Length; + + while (ActualReadOffset < EndOfExtent) + { + Status = CdfsReadSectors + (DeviceExt->StorageDevice, + Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE), + 1, + PageBuf, + FALSE); + + if (!NT_SUCCESS(Status)) + break; + + ReadLen = BLOCKSIZE - (ActualReadOffset & (BLOCKSIZE - 1)); + if (ReadLen > EndOfExtent - ActualReadOffset) + { + ReadLen = EndOfExtent - ActualReadOffset; + } + + RtlCopyMemory(TargetRead, ReadInPage, ReadLen); + + ActualReadOffset += ReadLen; + TargetRead += ReadLen; + } + + ExFreePool(PageBuf); + } + else + { + if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) + Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; + + Status = CdfsReadSectors(DeviceExt->StorageDevice, + Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), + Length / BLOCKSIZE, + Buffer, + FALSE); + if (NT_SUCCESS(Status)) + { + *LengthRead = Length; + if (Length + ReadOffset > Fcb->Entry.DataLengthL) + { + memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, + 0, + Length + ReadOffset - Fcb->Entry.DataLengthL); + } } }

1 0

[dgoette] 37487: implement new entry 'page & content' generation
by dgoette＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: dgoette Date: Thu Nov 20 13:25:28 2008 New Revision: 37487 URL: http://svn.reactos.org/svn/reactos?rev=37487&view=rev Log: implement new entry 'page & content' generation Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Thu Nov 20 13:25:28 2008 @@ -529,13 +529,11 @@ * @return bool * @access public */ - public static function add( $show_output = false, $dynamic_content = false, $entry_status = 'draft', $layout_template = '') + public static function add($data_type = null, $lang = null, $show_output = false, $dynamic_content = false, $entry_status = 'draft', $layout_template = '') { global $roscms_intern_account_id; $data_name = @htmlspecialchars($_GET['d_name']); - $data_type = @$_GET['d_type']; - $lang = @$_GET['d_r_lang']; $stmt=DBConnection::getInstance()->prepare("SELECT data_id FROM data_ WHERE data_name = :name AND data_type = :type LIMIT 1"); $stmt->bindParam('name',$data_name,PDO::PARAM_STR); @@ -599,8 +597,8 @@ $stmt->execute(); } - if ($layout_template != '' && $layout_template != 'no') { - $content = " '[#templ_".$layout_template."]' "; + if ($layout_template != '' && $layout_template != 'none') { + $content = '[#templ_'.$layout_template.']'; } else { $content = ''; @@ -645,12 +643,7 @@ new Editor_Website($data_id, $rev_id, 'show'); } } - - // nothing todo, even revision entry is already there - elseif ($show_output == true) { - echo '<p>Entry already exist.</p>'; - Editor_Website::showAddEntry(); - } + } // end of member function getCookieDomain Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Thu Nov 20 13:25:28 2008 @@ -48,6 +48,7 @@ protected function evalAction( $action ) { global $roscms_security_level; + global $roscms_standard_language; global $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3, $RosCMS_GET_d_value4; global $RosCMS_GET_d_id, $RosCMS_GET_d_r_id; global $RosCMS_GET_d_r_lang; @@ -78,18 +79,18 @@ // single entry - save entry case 'newentry2': - Data::add(true, false); + Data::add(@$_GET['d_type'], @$_GET['d_r_lang'],true); break; // dynamic entry - save entry case 'newentry4': - Data::add(true, true); + Data::add('content', $roscms_standard_language,true, true); break; // page & content - save entry case 'newentry3': - Data::add(false, false, 'stable', htmlspecialchars(@$_GET['d_template'])); - Data::add(true); + Data::add('page', $roscms_standard_language, false, false, 'stable', htmlspecialchars(@$_GET['d_template'])); + Data::add('content', $roscms_standard_language, true); break; // show Metadata details

1 0

[sginsberg] 37486: - Fix "missing newling" warning
by sginsberg＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: sginsberg Date: Thu Nov 20 13:00:17 2008 New Revision: 37486 URL: http://svn.reactos.org/svn/reactos?rev=37486&view=rev Log: - Fix "missing newling" warning Modified: trunk/reactos/include/psdk/dsgetdc.h Modified: trunk/reactos/include/psdk/dsgetdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsgetdc.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dsgetdc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dsgetdc.h [iso-8859-1] Thu Nov 20 13:00:17 2008 @@ -109,4 +109,4 @@ #ifdef __cplusplus } #endif -#endif +#endif

1 0

[sginsberg] 37485: - Remove more instances of system_header
by sginsberg＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: sginsberg Date: Thu Nov 20 09:30:15 2008 New Revision: 37485 URL: http://svn.reactos.org/svn/reactos?rev=37485&view=rev Log: - Remove more instances of system_header Modified: trunk/reactos/include/psdk/objfwd.h trunk/reactos/include/psdk/odbcinst.h trunk/reactos/include/psdk/ole.h trunk/reactos/include/psdk/oleacc.h trunk/reactos/include/psdk/olectlid.h Modified: trunk/reactos/include/psdk/objfwd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objfwd.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/objfwd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objfwd.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OBJFWD_H #define _OBJFWD_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #include <basetyps.h> Modified: trunk/reactos/include/psdk/odbcinst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/odbcinst.h?re… ============================================================================== --- trunk/reactos/include/psdk/odbcinst.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/odbcinst.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,6 @@ #ifndef _ODBCINST_H #define _ODBCINST_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif + #include <sql.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/ole.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ole.h?rev=374… ============================================================================== --- trunk/reactos/include/psdk/ole.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ole.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OLE_H #define _OLE_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/oleacc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oleacc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/oleacc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oleacc.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OLEACC_H #define _OLEACC_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/olectlid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/olectlid.h?re… ============================================================================== --- trunk/reactos/include/psdk/olectlid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/olectlid.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OLECTLID_H #define _OLECTLID_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" {

1 0

[jimtabor] 37484: - Add Section support for CreateDIBSection. Section support was disabled from the first time it was committed at revision 1753.
by jimtabor＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: jimtabor Date: Thu Nov 20 09:11:43 2008 New Revision: 37484 URL: http://svn.reactos.org/svn/reactos?rev=37484&view=rev Log: - Add Section support for CreateDIBSection. Section support was disabled from the first time it was committed at revision 1753. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Nov 20 09:11:43 2008 @@ -404,7 +404,7 @@ _SEH_TRY // Look at NtGdiStretchDIBitsInternal { SourceSize.cx = bmi->bmiHeader.biWidth; - SourceSize.cy = ScanLines; + SourceSize.cy = ScanLines; // this one --> abs(bmi->bmiHeader.biHeight) - StartScan DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); ProbeForRead(Bits, DIBWidth * abs(bmi->bmiHeader.biHeight), 1); @@ -479,8 +479,8 @@ if (NT_SUCCESS(Status)) { - /* FIXME: Should probably be only the number of lines actually copied */ - ret = ScanLines; + /* FIXME: Should probably be only the number of lines actually copied */ + ret = ScanLines; // this one --> abs(Info->bmiHeader.biHeight) - StartScan; } if (pSourceSurf) EngUnlockSurface(pSourceSurf); @@ -555,7 +555,7 @@ coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - /* Resulting height may be smaller than original height */ + /* Resulting height may be smaller than original height */ // You think! coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); coreheader->bcSize = DIB_GetDIBWidthBytes(coreheader->bcWidth, coreheader->bcBitCount) * coreheader->bcHeight; @@ -566,6 +566,8 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { ProbeForWrite(Info, sizeof(BITMAPINFO), 1); + + if (!ScanLines) ScanLines = abs(Info->bmiHeader.biHeight) - StartScan; Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; /* Resulting height may be smaller than original height */ @@ -683,16 +685,18 @@ if (bPaletteMatch) PALETTE_UnlockPalette(DestPalette); + if (!ScanLines) ScanLines = abs(Info->bmiHeader.biHeight) - StartScan; + /* Create the destination bitmap to for the copy operation */ if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) { _SEH_YIELD(goto cleanup); } else - { + { // Here again! ScanLine can be zero! ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; - DestSize.cy = ScanLines; + DestSize.cy = ScanLines; // this one ---> abs(Info->bmiHeader.biHeight) - StartScan; hDestBitmap = NULL; @@ -762,6 +766,8 @@ &DestRect, &SourcePoint)) { + DPRINT("GetDIBits %d \n",abs(Info->bmiHeader.biHeight) - StartScan); +// Result = abs(Info->bmiHeader.biHeight) - StartScan; Result = ScanLines; } @@ -1131,6 +1137,7 @@ HBITMAP res = 0; BITMAPOBJ *bmp = NULL; DIBSECTION *dib = NULL; + void *mapBits = NULL; // Fill BITMAP32 structure with DIB data BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1167,17 +1174,50 @@ if (section) { -/* bm.bmBits = MapViewOfFile(section, FILE_MAP_ALL_ACCESS, - 0L, offset, totalSize); */ - DbgPrint("DIB_CreateDIBSection: Cannot yet handle section DIBs\n"); - SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + SYSTEM_BASIC_INFORMATION Sbi; + NTSTATUS Status; + DWORD mapOffset; + LARGE_INTEGER SectionOffset; + SIZE_T mapSize; + + Status = ZwQuerySystemInformation ( SystemBasicInformation, + &Sbi, + sizeof Sbi, + 0); + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + mapOffset = offset - (offset % Sbi.AllocationGranularity); + mapSize = dib->dsBmih.biSizeImage + (offset - mapOffset); + + SectionOffset.LowPart = mapOffset; + SectionOffset.HighPart = 0; + + Status = ZwMapViewOfSection ( section, + NtCurrentProcess(), + &mapBits, + 0, + 0, + &SectionOffset, + &mapSize, + ViewShare, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + if (mapBits) bm.bmBits = (char *)mapBits + (offset - mapOffset); } else if (ovr_pitch && offset) bm.bmBits = (LPVOID) offset; - else { - offset = 0; - bm.bmBits = EngAllocUserMem(totalSize, 0); + else + { + offset = 0; + bm.bmBits = EngAllocUserMem( totalSize, 0 ); } if(usage == DIB_PAL_COLORS) @@ -1202,20 +1242,16 @@ } else switch(bi->biBitCount) { + case 15: case 16: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; case 24: - dib->dsBitfields[0] = 0xff0000; - dib->dsBitfields[1] = 0x00ff00; - dib->dsBitfields[2] = 0x0000ff; - break; - case 32: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; break; @@ -1226,38 +1262,41 @@ // Create Device Dependent Bitmap and add DIB pointer Size.cx = bm.bmWidth; Size.cy = abs(bm.bmHeight); - res = IntCreateBitmap(Size, bm.bmWidthBytes, - BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), - BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | - (bi->biHeight < 0 ? BMF_TOPDOWN : 0), - bm.bmBits); - if (! res) - { + res = IntCreateBitmap( Size, + bm.bmWidthBytes, + BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), + BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | + (bi->biHeight < 0 ? BMF_TOPDOWN : 0), + bm.bmBits); + if ( !res ) + { if (lpRGB != bmi->bmiColors) - { + { ExFreePoolWithTag(lpRGB, TAG_COLORMAP); - } + } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return NULL; - } + } bmp = BITMAPOBJ_LockBitmap(res); if (NULL == bmp) - { + { if (lpRGB != bmi->bmiColors) - { + { ExFreePoolWithTag(lpRGB, TAG_COLORMAP); - } + } SetLastWin32Error(ERROR_INVALID_HANDLE); NtGdiDeleteObject(bmp); return NULL; - } + } bmp->dib = (DIBSECTION *) dib; bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - /* WINE NOTE: WINE makes use of a colormap, which is a color translation table between the DIB and the X physical - device. Obviously, this is left out of the ReactOS implementation. Instead, we call - NtGdiSetDIBColorTable. */ + /* WINE NOTE: WINE makes use of a colormap, which is a color translation + table between the DIB and the X physical device. Obviously, + this is left out of the ReactOS implementation. Instead, + we call NtGdiSetDIBColorTable. */ bi->biClrUsed = 0; + /* set number of entries in bmi.bmiColors table */ if(bi->biBitCount == 1) { bi->biClrUsed = 2; } else if(bi->biBitCount == 4) { bi->biClrUsed = 16; } else if(bi->biBitCount == 8) { bi->biClrUsed = 256; } @@ -1278,13 +1317,17 @@ if (!res || !bmp || !dib || !bm.bmBits) { DPRINT("got an error res=%08x, bmp=%p, dib=%p, bm.bmBits=%p\n", res, bmp, dib, bm.bmBits); -/* if (bm.bmBits) + if (bm.bmBits) { - if (section) - UnmapViewOfFile(bm.bmBits), bm.bmBits = NULL; - else if (!offset) - VirtualFree(bm.bmBits, 0L, MEM_RELEASE), bm.bmBits = NULL; - } */ + if (section) + { + ZwUnmapViewOfSection(NtCurrentProcess(), mapBits); + bm.bmBits = NULL; + } + else + if (!offset) + EngFreeUserMem(bm.bmBits), bm.bmBits = NULL; + } if (dib) { ExFreePoolWithTag(dib, TAG_DIB); dib = NULL; } if (bmp) { bmp = NULL; } @@ -1292,20 +1335,20 @@ } if (lpRGB != bmi->bmiColors) - { + { ExFreePoolWithTag(lpRGB, TAG_COLORMAP); - } + } if (bmp) - { + { BITMAPOBJ_UnlockBitmap(bmp); - } + } // Return BITMAP handle and storage location if (NULL != bm.bmBits && NULL != bits) - { + { *bits = bm.bmBits; - } + } return res; }

1 0

[sginsberg] 37483: - Correct a header guard
by sginsberg＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: sginsberg Date: Thu Nov 20 09:02:42 2008 New Revision: 37483 URL: http://svn.reactos.org/svn/reactos?rev=37483&view=rev Log: - Correct a header guard Modified: trunk/reactos/include/psdk/mlang.idl Modified: trunk/reactos/include/psdk/mlang.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/mlang.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mlang.idl [iso-8859-1] Thu Nov 20 09:02:42 2008 @@ -23,7 +23,7 @@ interface IStream; /* FIXME: LANGID is defined in winnt.h and mlang.h in the platform SDK */ -cpp_quote("#ifndef _WINNT_") +cpp_quote("#ifndef _WINNT_H") typedef WORD LANGID; cpp_quote("#endif")

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
66
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 November 2008