Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[tkreuzer] 64040: [GDI32] Use GdiAllocBatchCommand in SetBrushOrgEx instead of manual and broken fiddling with GdiTebBatch. Fixes CID 716217.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 5 20:16:52 2014 New Revision: 64040 URL: http://svn.reactos.org/svn/reactos?rev=64040&view=rev Log: [GDI32] Use GdiAllocBatchCommand in SetBrushOrgEx instead of manual and broken fiddling with GdiTebBatch. Fixes CID 716217. Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/objects/brush.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Fri Sep 5 20:16:52 2014 @@ -323,7 +323,7 @@ else if (Cmd == GdiBCPolyPatBlt) cjSize = 0; else if (Cmd == GdiBCTextOut) cjSize = 0; else if (Cmd == GdiBCExtTextOut) cjSize = 0; - else if (Cmd == GdiBCSetBrushOrg) cjSize = 0; + else if (Cmd == GdiBCSetBrushOrg) cjSize = sizeof(GDIBSSETBRHORG); else if (Cmd == GdiBCExtSelClipRgn) cjSize = 0; else if (Cmd == GdiBCSelObj) cjSize = sizeof(GDIBSOBJECT); else if (Cmd == GdiBCDelRgn) cjSize = sizeof(GDIBSOBJECT); Modified: trunk/reactos/win32ss/gdi/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] Fri Sep 5 20:16:52 2014 @@ -393,44 +393,37 @@ return FALSE; } #endif - if (GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) - { - PTEB pTeb = NtCurrentTeb(); + if (GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID)&Dc_Attr)) + { + PGDIBSSETBRHORG pgSBO; + + /* Does the caller want the current brush origin to be returned? */ if (lppt) { lppt->x = Dc_Attr->ptlBrushOrigin.x; lppt->y = Dc_Attr->ptlBrushOrigin.y; } - if ((nXOrg == Dc_Attr->ptlBrushOrigin.x) && (nYOrg == Dc_Attr->ptlBrushOrigin.y)) + + /* Check if we have nothing to do */ + if ((nXOrg == Dc_Attr->ptlBrushOrigin.x) && + (nYOrg == Dc_Attr->ptlBrushOrigin.y)) return TRUE; - if(((pTeb->GdiTebBatch.HDC == NULL) || (pTeb->GdiTebBatch.HDC == hdc)) && - ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSSETBRHORG)) <= GDIBATCHBUFSIZE) && - (!(Dc_Attr->ulDirty_ & DC_DIBSECTION)) ) - { - PGDIBSSETBRHORG pgSBO = (PGDIBSSETBRHORG)(&pTeb->GdiTebBatch.Buffer[0] + - pTeb->GdiTebBatch.Offset); - + /* Allocate a batch command buffer */ + pgSBO = GdiAllocBatchCommand(hdc, GdiBCSetBrushOrg); + if (pgSBO != NULL) + { + /* Set current brush origin in the DC attribute */ Dc_Attr->ptlBrushOrigin.x = nXOrg; Dc_Attr->ptlBrushOrigin.y = nYOrg; - pgSBO->gbHdr.Cmd = GdiBCSetBrushOrg; - pgSBO->gbHdr.Size = sizeof(GDIBSSETBRHORG); + /* Setup the GDI batch command */ pgSBO->ptlBrushOrigin = Dc_Attr->ptlBrushOrigin; - pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); - pTeb->GdiTebBatch.HDC = hdc; - pTeb->GdiBatchCount++; - DPRINT("Loading the Flush!! COUNT-> %lu\n", pTeb->GdiBatchCount); - - if (pTeb->GdiBatchCount >= GDI_BatchLimit) - { - DPRINT("Call GdiFlush!!\n"); - NtGdiFlush(); - DPRINT("Exit GdiFlush!!\n"); - } return TRUE; } } - return NtGdiSetBrushOrg(hdc,nXOrg,nYOrg,lppt); -} + + /* Fall back to the slower kernel path */ + return NtGdiSetBrushOrg(hdc, nXOrg, nYOrg, lppt); +}

10 years

[tkreuzer] 64039: [SPEC2DEF] Add support for ARM asm stub generation [HALARM] Add a dummy CMakeLists.txt [BOOTVID] Fix ARM compilation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 5 20:07:53 2014 New Revision: 64039 URL: http://svn.reactos.org/svn/reactos?rev=64039&view=rev Log: [SPEC2DEF] Add support for ARM asm stub generation [HALARM] Add a dummy CMakeLists.txt [BOOTVID] Fix ARM compilation Added: trunk/reactos/hal/halarm/CMakeLists.txt (with props) Modified: trunk/reactos/drivers/base/bootvid/precomp.h trunk/reactos/hal/CMakeLists.txt trunk/reactos/include/crt/crtdefs.h trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -1,7 +1,7 @@ #ifndef _BOOTVID_PCH_ #define _BOOTVID_PCH_ -#include <wdm.h> +#include <ntddk.h> #include <drivers/bootvid/bootvid.h> /* Define if FontData has upside down characters */ Modified: trunk/reactos/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/CMakeLists.txt?rev=640… ============================================================================== --- trunk/reactos/hal/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/CMakeLists.txt [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -3,7 +3,7 @@ if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64")) add_subdirectory(halx86) elseif(ARCH STREQUAL "arm") -# add_subdirectory(halarm) + add_subdirectory(halarm) elseif(ARCH STREQUAL "powerpc") # add_subdirectory(halppc) endif() Added: trunk/reactos/hal/halarm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halarm/CMakeLists.txt (added) +++ trunk/reactos/hal/halarm/CMakeLists.txt [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -0,0 +1,17 @@ + +spec2def(hal.dll ../hal.spec ADD_IMPORTLIB) + +add_definitions( + -D_NTHALDLL_ + -D_NTHAL_) + +include_directories( + include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +list(APPEND SOURCES + omap3/halinit_up.c + omap3/halup.rc) + +add_library(hal SHARED + ${SOURCES}) Propchange: trunk/reactos/hal/halarm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -126,7 +126,7 @@ #endif #ifndef UNALIGNED -#if defined(__ia64__) || defined(__x86_64) +#if defined(__ia64__) || defined(__x86_64) || defined(__arm__) #define UNALIGNED __unaligned #else #define UNALIGNED Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -259,56 +259,82 @@ if (giArch == ARCH_X86) { - fprintf(file, ".586\n.model flat\n"); + fprintf(file, ".586\n.model flat\n.code\n"); + } + else if (giArch == ARCH_AMD64) + { + fprintf(file, ".code\n"); } else if (giArch == ARCH_ARM) { - fprintf(file, "#include <kxarm.h>\n TEXTAREA\n"); - } - - fprintf(file, ".code\n"); + fprintf(file, + " AREA |.text|,ALIGN=2,CODE,READONLY\n\n"); + } +} + +void +Output_symbol(FILE *fileDest, char* pszSymbolName) +{ + if (giArch == ARCH_ARM) + { + fprintf(fileDest, + " EXPORT %s [FUNC]\n%s\n", + pszSymbolName, + pszSymbolName); + } + else + { + fprintf(fileDest, + "PUBLIC %s\n%s: nop\n", + pszSymbolName, + pszSymbolName); + } } int OutputLine_asmstub(FILE *fileDest, EXPORT *pexp) { + char szNameBuffer[128]; + /* Handle autoname */ if (pexp->strName.len == 1 && pexp->strName.buf[0] == '@') { - fprintf(fileDest, "PUBLIC %sordinal%d\n%sordinal%d: nop\n", + sprintf(szNameBuffer, "%sordinal%d\n%sordinal%d: nop\n", gpszUnderscore, pexp->nOrdinal, gpszUnderscore, pexp->nOrdinal); } else if (giArch != ARCH_X86) { - fprintf(fileDest, "PUBLIC _stub_%.*s\n_stub_%.*s: nop\n", + sprintf(szNameBuffer, "_stub_%.*s", pexp->strName.len, pexp->strName.buf, pexp->strName.len, pexp->strName.buf); } else if (pexp->nCallingConvention == CC_STDCALL) { - fprintf(fileDest, "PUBLIC __stub_%.*s@%d\n__stub_%.*s@%d: nop\n", + sprintf(szNameBuffer, "__stub_%.*s@%d", pexp->strName.len, pexp->strName.buf, pexp->nStackBytes, pexp->strName.len, pexp->strName.buf, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_FASTCALL) { - fprintf(fileDest, "PUBLIC @_stub_%.*s@%d\n@_stub_%.*s@%d: nop\n", + sprintf(szNameBuffer, "@_stub_%.*s@%d", pexp->strName.len, pexp->strName.buf, pexp->nStackBytes, pexp->strName.len, pexp->strName.buf, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_CDECL || pexp->nCallingConvention == CC_STUB) { - fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s: nop\n", + sprintf(szNameBuffer, "__stub_%.*s", pexp->strName.len, pexp->strName.buf, pexp->strName.len, pexp->strName.buf); } else if (pexp->nCallingConvention == CC_EXTERN) { - fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s:\n", + sprintf(szNameBuffer, "__stub_%.*s", pexp->strName.len, pexp->strName.buf, pexp->strName.len, pexp->strName.buf); } + + Output_symbol(fileDest, szNameBuffer); return 1; } @@ -1038,7 +1064,7 @@ OutputHeader_asmstub(file, pszDllName); result = ParseFile(pszSource, file, OutputLine_asmstub); - fprintf(file, "\nEND\n"); + fprintf(file, "\n END\n"); fclose(file); }

10 years

[tkreuzer] 64038: [PSEH] Add dummy seh_prolog.s for arm. Dedicated to Z98

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 5 17:55:35 2014 New Revision: 64038 URL: http://svn.reactos.org/svn/reactos?rev=64038&view=rev Log: [PSEH] Add dummy seh_prolog.s for arm. Dedicated to Z98 Added: trunk/reactos/lib/pseh/arm/ (with props) trunk/reactos/lib/pseh/arm/seh_prolog.s (with props) Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 5 17:55:35 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/pseh/arm/seh_prolog.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/arm/seh_prolog.s?… ============================================================================== --- trunk/reactos/lib/pseh/arm/seh_prolog.s (added) +++ trunk/reactos/lib/pseh/arm/seh_prolog.s [iso-8859-1] Fri Sep 5 17:55:35 2014 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/pseh/arm/seh_prolog.S + * PURPOSE: SEH Support for MSVC / ARM + * PROGRAMMERS: Timo Kreuzer + */ + +/* INCLUDES ******************************************************************/ + +#include "ksarm.h" + + TEXTAREA + + IMPORT __except_handler + + LEAF_ENTRY _SEH_prolog + + + LEAF_END _SEH_prolog + + + + LEAF_ENTRY _SEH_epilog + + + LEAF_END _SEH_epilog + + + + END Propchange: trunk/reactos/lib/pseh/arm/seh_prolog.s ------------------------------------------------------------------------------ svn:eol-style = native

10 years

[akhaldi] 64037: [NTOS:LPC] * Remove unused pointer and logically dead code paths. CID 1237020. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 5 09:41:25 2014 New Revision: 64037 URL: http://svn.reactos.org/svn/reactos?rev=64037&view=rev Log: [NTOS:LPC] * Remove unused pointer and logically dead code paths. CID 1237020. CORE-7975 Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Fri Sep 5 09:41:25 2014 @@ -188,7 +188,7 @@ NtReplyPort(IN HANDLE PortHandle, IN PPORT_MESSAGE ReplyMessage) { - PLPCP_PORT_OBJECT Port, ConnectionPort = NULL; + PLPCP_PORT_OBJECT Port; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; PLPCP_MESSAGE Message; @@ -256,7 +256,6 @@ { /* No thread found, fail */ ObDereferenceObject(Port); - if (ConnectionPort) ObDereferenceObject(ConnectionPort); return Status; } @@ -265,7 +264,6 @@ if (!Message) { /* Fail if we couldn't allocate a message */ - if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); return STATUS_NO_MEMORY; @@ -282,7 +280,6 @@ { /* It isn't, fail */ LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); - if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); return STATUS_REPLY_MESSAGE_MISMATCH;

10 years

[akhaldi] 64036: [NTOS:OB] * Fix a nasty typo in ObOpenObjectByName(). CID 1237016. CORE-7975

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 5 09:20:37 2014 New Revision: 64036 URL: http://svn.reactos.org/svn/reactos?rev=64036&view=rev Log: [NTOS:OB] * Fix a nasty typo in ObOpenObjectByName(). CID 1237016. CORE-7975 Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Fri Sep 5 09:20:37 2014 @@ -2567,7 +2567,7 @@ AccessMode, NULL, Handle); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status2)) { ObDereferenceObject(Object); Status = Status2;

10 years

[akhaldi] 64035: [MSVCRT] * Use Wine's _pclose(). Fixes msvcrt:misc crash. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 4 13:39:51 2014 New Revision: 64035 URL: http://svn.reactos.org/svn/reactos?rev=64035&view=rev Log: [MSVCRT] * Use Wine's _pclose(). Fixes msvcrt:misc crash. CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] Thu Sep 4 13:39:51 2014 @@ -20,6 +20,14 @@ int alloc_fd(HANDLE hand, int flag); //FIXME: Remove unsigned split_oflags(unsigned oflags); //FIXME: Remove + +#ifndef _UNICODE +static struct popen_handle { + FILE *f; + HANDLE proc; +} *popen_handles; +static DWORD popen_handles_size; +#endif /* * @implemented @@ -130,16 +138,40 @@ /* * @implemented */ -int _pclose (FILE *pp) +int CDECL _pclose(FILE* file) { - TRACE("_pclose(%x)",pp); + HANDLE h; + DWORD i; - fclose(pp); - //if (!TerminateProcess(pp->_tmpfname ,0)) - // return( -1 ); - return( 0 ); + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + _mlock(_POPEN_LOCK); + for(i=0; i<popen_handles_size; i++) + { + if (popen_handles[i].f == file) + break; + } + if(i == popen_handles_size) + { + _munlock(_POPEN_LOCK); + *_errno() = EBADF; + return -1; + } + + h = popen_handles[i].proc; + popen_handles[i].f = NULL; + _munlock(_POPEN_LOCK); + + fclose(file); + if(WaitForSingleObject(h, INFINITE)==WAIT_FAILED || !GetExitCodeProcess(h, &i)) + { + _dosmaperr(GetLastError()); + CloseHandle(h); + return -1; + } + + CloseHandle(h); + return i; } #endif - -

10 years

[spetreolle] 64034: [EVENTLOG] Remove the event log handle from the list *before* destroying it. Fixes failure in advapi32:eventlog double close test.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Sep 3 23:07:47 2014 New Revision: 64034 URL: http://svn.reactos.org/svn/reactos?rev=64034&view=rev Log: [EVENTLOG] Remove the event log handle from the list *before* destroying it. Fixes failure in advapi32:eventlog double close test. Modified: trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Sep 3 23:07:47 2014 @@ -1252,7 +1252,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed!\n"); + DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status); goto Done; } @@ -1311,7 +1311,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed!\n"); + DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status); } Done: Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Sep 3 23:07:47 2014 @@ -215,9 +215,9 @@ if (!ElfGetLogHandleEntryByHandle(lpLogHandle)) return STATUS_INVALID_HANDLE; + RemoveEntryList(&lpLogHandle->LogHandleListEntry); LogfClose(lpLogHandle->LogFile, FALSE); - RemoveEntryList(&lpLogHandle->LogHandleListEntry); HeapFree(GetProcessHeap(),0,lpLogHandle); return STATUS_SUCCESS; @@ -291,7 +291,7 @@ PLOGHANDLE lpLogHandle; PLOGFILE lpLogFile; - DPRINT("ElfrNumberOfRecords()"); + DPRINT("ElfrNumberOfRecords()\n"); lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); if (!lpLogHandle)

10 years

[spetreolle] 64033: [EVENTLOG] Fix creation of backup event log files. Thanks to zefklop for his help.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Sep 3 21:03:35 2014 New Revision: 64033 URL: http://svn.reactos.org/svn/reactos?rev=64033&view=rev Log: [EVENTLOG] Fix creation of backup event log files. Thanks to zefklop for his help. Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Sep 3 21:03:35 2014 @@ -1234,7 +1234,7 @@ goto Done; } - if (!ReadFile(LogFile->hFile, &Buffer, dwRecSize, &dwRead, NULL)) + if (!ReadFile(LogFile->hFile, Buffer, dwRecSize, &dwRead, NULL)) { DPRINT1("ReadFile() failed!\n"); goto Done;

10 years

[akhaldi] 64032: [URLMON] * Revisit the exports to match IE8 which we apparently report. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 3 19:29:54 2014 New Revision: 64032 URL: http://svn.reactos.org/svn/reactos?rev=64032&view=rev Log: [URLMON] * Revisit the exports to match IE8 which we apparently report. CORE-8174 Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Wed Sep 3 19:29:54 2014 @@ -1,97 +1,269 @@ #100 ZoneMappingToRegKey -#101 stub AsyncGetClassBits -102 stdcall AsyncInstallDistributionUnit(ptr ptr ptr long long ptr ptr ptr long) -103 stdcall BindAsyncMoniker(ptr long ptr ptr ptr) -#104 stub CDLGetLongPathNameA -#105 stub CDLGetLongPathNameW -106 stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) -#107 stub CoInstall -@ stdcall CoInternetCombineIUri(ptr ptr long ptr long) -108 stdcall CoInternetCombineUrl(wstr wstr long ptr long ptr long) -109 stdcall CoInternetCompareUrl(wstr wstr long) -110 stdcall CoInternetCreateSecurityManager(ptr ptr long) -111 stdcall CoInternetCreateZoneManager(ptr ptr long) -#112 CoInternetFeatureSettingsChanged -#113 stub CoInternetGetProtocolFlags -114 stdcall CoInternetGetSecurityUrl(ptr ptr long long) -115 stdcall CoInternetGetSession(long ptr long) -116 stdcall CoInternetIsFeatureEnabled(long long) -117 stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) -118 stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long) -119 stdcall CoInternetParseUrl(wstr long long wstr long ptr long) -120 stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) -121 stdcall CoInternetSetFeatureEnabled(long long long) -122 stdcall CompareSecurityIds(ptr long ptr long long) -#123 CompatFlagsFromClsid -124 stdcall CopyBindInfo(ptr ptr) -125 stdcall CopyStgMedium(ptr ptr) -126 stdcall CreateAsyncBindCtx(long ptr ptr ptr) -127 stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) -128 stdcall CreateFormatEnumerator(long ptr ptr) -129 stdcall CreateURLMoniker(ptr wstr ptr) -130 stdcall CreateURLMonikerEx(ptr wstr ptr long) +#101 CoInternetIsExtensionsOff +#102 CoInternetSetExtensionsOff +#103 CoInternetExtensionAllowed +#104 CoInternetCreateExtension +#105 CoInternetExtensionCollectStats +#106 CoInternetExtensionNeedsApproval +#107 CoInternetApproveExtension +108 stdcall -noname IsInternetESCEnabledLocal() +#109 stub AsyncGetClassBits +110 stdcall AsyncInstallDistributionUnit(ptr ptr ptr long long ptr ptr ptr long) +111 stdcall -noname IsProtectedModeURL(ptr) +#112 IsProtectedModeIUri +#113 IsFileInSpecialDirs +#114 SkipBrokerCheckForURL +#115 IEIsProtectedModeURLInternal +#116 CoInternetDomainNeedsApproval +117 stdcall BindAsyncMoniker(ptr long ptr ptr ptr) +#118 stub CDLGetLongPathNameA +#119 stub CDLGetLongPathNameW +120 stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) +#121 stub CoInstall +#122 CoInternetCanonicalizeIUri +123 stdcall CoInternetCombineIUri(ptr ptr long ptr long) +124 stdcall CoInternetCombineUrl(wstr wstr long ptr long ptr long) +125 stdcall CoInternetCombineUrlEx(ptr wstr long ptr long) +126 stdcall CoInternetCompareUrl(wstr wstr long) +127 stdcall CoInternetCreateSecurityManager(ptr ptr long) +128 stdcall CoInternetCreateZoneManager(ptr ptr long) +#129 CoInternetFeatureSettingsChanged +#130 stub CoInternetGetProtocolFlags +131 stdcall CoInternetGetSecurityUrl(ptr ptr long long) +132 stdcall CoInternetGetSecurityUrlEx(ptr ptr long long) +133 stdcall CoInternetGetSession(long ptr long) +134 stdcall CoInternetIsFeatureEnabled(long long) +#135 CoInternetIsFeatureEnabledForIUri +136 stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) +137 stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long) +138 stdcall CoInternetParseIUri(ptr long long wstr long ptr long) +139 stdcall CoInternetParseUrl(wstr long long wstr long ptr long) +140 stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) +141 stdcall CoInternetSetFeatureEnabled(long long long) +142 stdcall CompareSecurityIds(ptr long ptr long long) +#143 CompatFlagsFromClsid +144 stdcall CopyBindInfo(ptr ptr) +145 stdcall CopyStgMedium(ptr ptr) +146 stdcall CreateAsyncBindCtx(long ptr ptr ptr) +147 stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) +148 stdcall CreateFormatEnumerator(long ptr ptr) +149 stdcall CreateIUriBuilder(ptr long long ptr) +150 stdcall CreateURLMoniker(ptr wstr ptr) +151 stdcall CreateURLMonikerEx2(ptr ptr ptr long) +152 stdcall CreateURLMonikerEx(ptr wstr ptr long) +153 stdcall CreateUri(wstr long long ptr) +#154 CreateUriFromMultiByteString +#155 CreateUriPriv +156 stdcall CreateUriWithFragment(wstr wstr long long ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllRegisterServerEx() @ stdcall -private DllUnregisterServer() -137 stdcall Extract(long ptr) -138 stdcall FaultInIEFeature(long ptr ptr long) -#139 stub FindMediaType -#140 stub FindMediaTypeClass -141 stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) -#142 GetAddSitesFileUrl -143 stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) -#144 stub GetClassURL -#145 stub GetComponentIDFromCLSSPEC -#146 stub GetMarkOfTheWeb -147 stdcall GetSoftwareUpdateInfo(ptr ptr) -148 stdcall -stub HlinkGoBack(ptr) -#149 stub HlinkGoForward -#150 stub HlinkNavigateMoniker -151 stdcall HlinkNavigateString(ptr wstr) -152 stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) -153 stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) -#154 InstallFlash -155 stdcall IsAsyncMoniker(ptr) -#156 stub IsJITInProgress -157 stdcall IsLoggingEnabledA(str) -158 stdcall IsLoggingEnabledW(wstr) -159 stdcall IsValidURL(ptr wstr long) -160 stdcall MkParseDisplayNameEx(ptr wstr ptr ptr) -161 stdcall ObtainUserAgentString(long str ptr) -#162 stub PrivateCoInstall -163 stdcall RegisterBindStatusCallback(ptr ptr ptr long) -164 stdcall RegisterFormatEnumerator(ptr ptr long) -#165 stub RegisterMediaTypeClass -166 stdcall RegisterMediaTypes(long ptr ptr) -167 stdcall ReleaseBindInfo(ptr) -168 stdcall RevokeBindStatusCallback(ptr ptr) -169 stdcall RevokeFormatEnumerator(ptr ptr) -#170 stub SetSoftwareUpdateAdvertisementState -#171 ShowTrustAlertDialog -#172 stub URLDownloadA -173 stdcall URLDownloadToCacheFileA(ptr str str long long ptr) -174 stdcall URLDownloadToCacheFileW(ptr wstr wstr long long ptr) -175 stdcall URLDownloadToFileA(ptr str str long ptr) -176 stdcall URLDownloadToFileW(ptr wstr wstr long ptr) -#177 stub URLDownloadW -178 stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) -179 stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) -#180 stub URLOpenPullStreamA -#181 stub URLOpenPullStreamW -182 stdcall URLOpenStreamA(ptr str long ptr) -183 stdcall URLOpenStreamW(ptr wstr long ptr) -#184 stub UrlMkBuildVersion -185 stdcall UrlMkGetSessionOption(long ptr long ptr long) -186 stdcall UrlMkSetSessionOption(long ptr long long) -#187 stub WriteHitLogging -#188 stub ZonesReInit - -#FIXME: Needed by Wine -@ stdcall CoInternetCombineUrlEx(ptr wstr long ptr long) -@ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) -@ stdcall CreateIUriBuilder(ptr long long ptr) -@ stdcall CreateUri(wstr long long ptr) -@ stdcall CreateURLMonikerEx2(ptr ptr ptr long) +163 stdcall Extract(long ptr) +164 stdcall FaultInIEFeature(long ptr ptr long) +#165 stub FindMediaType +#166 stub FindMediaTypeClass +167 stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) +#168 GetAddSitesFileUrl +169 stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) +#170 stub GetClassURL +#171 stub GetComponentIDFromCLSSPEC +#172 GetIDNFlagsForUri +#173 GetIUriPriv +#174 GetLabelsFromNamedHost +#175 stub GetMarkOfTheWeb +#176 GetPortFromUrlScheme +#177 GetPropertyFromName +#178 GetPropertyName +179 stdcall GetSoftwareUpdateInfo(ptr ptr) +#180 GetUrlmonThreadNotificationHwnd +181 stdcall -stub HlinkGoBack(ptr) +#182 stub HlinkGoForward +#183 stub HlinkNavigateMoniker +184 stdcall HlinkNavigateString(ptr wstr) +185 stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) +186 stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) +#187 IEInstallScope +#188 InstallFlash +#189 IntlPercentEncodeNormalize +190 stdcall IsAsyncMoniker(ptr) +#191 IsDWORDProperty +#192 IsIntranetAvailable +#193 stub IsJITInProgress +194 stdcall IsLoggingEnabledA(str) +195 stdcall IsLoggingEnabledW(wstr) +#196 IsStringProperty +197 stdcall IsValidURL(ptr wstr long) +198 stdcall MkParseDisplayNameEx(ptr wstr ptr ptr) +199 stdcall ObtainUserAgentString(long str ptr) +#200 stub PrivateCoInstall +#201 QueryAssociations +#202 QueryClsidAssociation +203 stdcall RegisterBindStatusCallback(ptr ptr ptr long) +204 stdcall RegisterFormatEnumerator(ptr ptr long) +#205 stub RegisterMediaTypeClass +206 stdcall RegisterMediaTypes(long ptr ptr) +207 stdcall ReleaseBindInfo(ptr) +#208 ResetUrlmonLanguageData +209 stdcall RevokeBindStatusCallback(ptr ptr) +210 stdcall RevokeFormatEnumerator(ptr ptr) +#211 stub SetSoftwareUpdateAdvertisementState +#212 ShouldDisplayPunycodeForUri +#213 ShouldShowIntranetWarningSecband +#214 ShowTrustAlertDialog +#215 stub URLDownloadA +216 stdcall URLDownloadToCacheFileA(ptr str str long long ptr) +217 stdcall URLDownloadToCacheFileW(ptr wstr wstr long long ptr) +218 stdcall URLDownloadToFileA(ptr str str long ptr) +219 stdcall URLDownloadToFileW(ptr wstr wstr long ptr) +#220 stub URLDownloadW +221 stdcall URLOpenBlockingStreamA(ptr str ptr long ptr) +222 stdcall URLOpenBlockingStreamW(ptr wstr ptr long ptr) +#223 stub URLOpenPullStreamA +#224 stub URLOpenPullStreamW +225 stdcall URLOpenStreamA(ptr str long ptr) +226 stdcall URLOpenStreamW(ptr wstr long ptr) +#227 stub UrlMkBuildVersion +228 stdcall UrlMkGetSessionOption(long ptr long ptr long) +229 stdcall UrlMkSetSessionOption(long ptr long long) +#230 stub WriteHitLogging +#231 stub ZonesReInit +#304 IECompatLogEventWithUrl +#305 IECompatLogPopupMgr +#306 IECompatLogMkAndViewSource +#307 IECompatLogMimeHandling +#308 IECompatLogControlBlock +#309 IECompatLogObjCache +#310 IECompatLogWindowRestriction +#311 IECompatLogBinaryBhvr +#312 IECompatLogIDNNavigation +#313 IECompatLogSSLNavBlock +#314 IECompatLogRedirectUrl +#315 IECompatLogScriptUrl +#316 IECompatLogAntiphishingUrl +#318 IECompatLogZoneElevation3 +#319 IECompatLogZoneElevation4 +#320 IECompatLogSubframeNavigate +#321 IECompatLogFileDownloadWithSrcUrl +#322 IECompatLogCSSFix +#323 IECompatLogUIPIBlockedExtension +#324 ResetWarnOnIntranetFlag +#325 PSCreateMemoryPropertyStore +#326 PSCreatePropertyStoreFromObject +#327 PSCreateAdapterFromPropertyStore +#328 VariantCompare +#329 VariantToGUID +#330 VariantToStringWithDefault +#331 InitPropVariantFromBuffer +#332 InitPropVariantFromCLSID +#333 InitPropVariantFromFileTime +#334 InitPropVariantFromString +#335 InitVariantFromBuffer +#336 InitVariantFromStrRet +#337 PropVariantGetElementCount +#338 PropVariantToBoolean +#339 PropVariantToInt32 +#340 PropVariantToUInt32 +#341 PropVariantToInt64 +#342 PropVariantToUInt64 +#343 PropVariantToBooleanWithDefault +#344 PropVariantToInt32WithDefault +#345 PropVariantToUInt32WithDefault +#346 PropVariantToInt64WithDefault +#347 PropVariantToUInt64WithDefault +#348 PropVariantToBuffer +#349 PropVariantToFileTime +#350 PropVariantToGUID +#351 PropVariantToStringAlloc +#352 VariantToBoolean +#353 VariantToBooleanWithDefault +#354 VariantToPropVariant +#355 PropVariantToVariant +#360 ClearVariantArray +#361 InitVariantFromFileTime +#362 InitVariantFromGUIDAsString +#363 InitVariantFromResource +#364 PropVariantToStringWithDefault +#365 PropVariantToString +#366 VariantToBuffer +#367 VariantToDouble +#368 VariantToDoubleArray +#369 VariantToDoubleArrayAlloc +#370 VariantToFileTime +#371 VariantToInt16 +#372 VariantToUInt16 +#373 VariantToInt32 +#374 VariantToUInt32 +#375 VariantToInt64 +#376 VariantToUInt64 +#377 VariantToInt16Array +#378 VariantToUInt16Array +#379 VariantToInt32Array +#380 VariantToUInt32Array +#381 VariantToInt64Array +#382 VariantToUInt64Array +#383 VariantToInt16ArrayAlloc +#384 VariantToUInt16ArrayAlloc +#385 VariantToInt32ArrayAlloc +#386 VariantToUInt32ArrayAlloc +#387 VariantToUInt32WithDefault +#388 VariantToInt64ArrayAlloc +#389 VariantToUInt64ArrayAlloc +#390 VariantToString +#391 VariantToStringArray +#392 VariantToStringArrayAlloc +#393 VariantToStringAlloc +#394 VariantToStrRet +#395 PropVariantToBSTR +#396 PropVariantChangeType +#400 InitCustomerFeedback +#401 DeinitCustomerFeedback +#403 SqmAddExtensionClsid +#404 SqmOptedIn +#406 ScheduleSqmTasksInIdleThread +#407 IESqmGetSession +#408 LogSqmDWord +#409 LogSqmBool +#410 LogSqmBits +#411 LogSqmSetString +#412 LogSqmIfMax +#413 LogSqmIfMin +#414 LogSqmIncrement +#415 LogSqmAddToAverage +#416 LogSqmAddToStreamDWord +#417 LogSqmAddToStreamString +#420 FindDomainOrHostFromUri +#421 GetIESqmMutex +#422 ReleaseIESqmMutex +#423 LogSqmUXCommandOffsetInternal +#430 IsSQMOptionEnabled +#431 SetSQMOption +#432 GetSQMUrl +#433 LCIELowerConnLimit +#434 IECompatLogApplicationProtocolDialog +#435 IECompatLogNavigationRestricted +#436 IECompatLogMimeSniffUnsafe +#437 IECompatLogMimeSniffImageNotUpgraded +#438 IECompatLogProxyContentManaged +#439 IECompatLogNoCompression +#440 LCIEGetEffectiveConnLimit +#441 UrlmonCreateInstance +#442 CreateBrowserEmulationFilter +#443 CreateReadOnlyBrowserEmulationFilter +#444 MapUriToBrowserEmulationState +#445 MapBrowserEmulationModeToUserAgent +#446 CoInternetGetBrowserProfile +#447 CoInternetSetBrowserProfile +#448 DeleteBrowserEmulationUserData +#449 CoInternetGetBrowserEmulationMode +#450 CoInternetSetBrowserEmulationMode +#451 CleanBrowserEmulationCache +#452 ClearSessionBasedEmulationData +#453 GetSecMgrCacheSeed +#454 SeedSecMgrCache +#455 FlushUrlmonZonesCache +#456 Urlmon_CleanIETldListCache +#457 CreateIETldListManager +#458 IsClientCertSuppliedInProcess

10 years

[akhaldi] 64031: [URLMON] * Bring back CoInternetCombineIUri. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 3 18:52:16 2014 New Revision: 64031 URL: http://svn.reactos.org/svn/reactos?rev=64031&view=rev Log: [URLMON] * Bring back CoInternetCombineIUri. CORE-8174 Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Wed Sep 3 18:52:16 2014 @@ -6,6 +6,7 @@ #105 stub CDLGetLongPathNameW 106 stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) #107 stub CoInstall +@ stdcall CoInternetCombineIUri(ptr ptr long ptr long) 108 stdcall CoInternetCombineUrl(wstr wstr long ptr long ptr long) 109 stdcall CoInternetCompareUrl(wstr wstr long) 110 stdcall CoInternetCreateSecurityManager(ptr ptr long)

10 years

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 September 2014