Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 63483: [atl] atl: memory leak on failure path (copy pasta?) spotted by Samuel Serapion CORE-8212
by cwittich＠svn.reactos.org 27 May '14

27 May '14

Author: cwittich Date: Tue May 27 21:20:39 2014 New Revision: 63483 URL: http://svn.reactos.org/svn/reactos?rev=63483&view=rev Log: [atl] atl: memory leak on failure path (copy pasta?) spotted by Samuel Serapion CORE-8212 Modified: trunk/reactos/lib/atl/statreg.h Modified: trunk/reactos/lib/atl/statreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/statreg.h?rev=6348… ============================================================================== --- trunk/reactos/lib/atl/statreg.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/statreg.h [iso-8859-1] Tue May 27 21:20:39 2014 @@ -272,7 +272,7 @@ { len = MultiByteToWideChar(CP_ACP, 0, regstra, filelen, NULL, 0) + 1; regstrw = reinterpret_cast<LPWSTR>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR))); - if (regstra == NULL) + if (regstrw == NULL) { HeapFree(GetProcessHeap(), 0, regstra); return E_OUTOFMEMORY;

1 0

[aandrejevic] 63482: [FAST486][NTVDM] Several fixes in fast486 and ntvdm: DosCopyEnvironmentBlock - prepend the program name tag (0x0001) to the program name. Fast486OpcodePushByteImm, Fast486Opcod...
by aandrejevic＠svn.reactos.org 27 May '14

27 May '14

Author: aandrejevic Date: Tue May 27 21:10:45 2014 New Revision: 63482 URL: http://svn.reactos.org/svn/reactos?rev=63482&view=rev Log: [FAST486][NTVDM] Several fixes in fast486 and ntvdm: DosCopyEnvironmentBlock - prepend the program name tag (0x0001) to the program name. Fast486OpcodePushByteImm, Fast486OpcodePushImm - sign-extend instead of zero-extending. Fast486InterruptInternal - The parameter is supposed to be the type of the gate, not a boolean. GET_SEGMENT_RPL will not work on real-mode selectors, use a special field for the RPL. Loading a data segment with the NULL selector should never generate an exception. Mask out the highest-order byte of the physical address when loading a descriptor table in 16-bit mode. Fast486InterruptInternal - The interrupt gate type determines the size. CORE-8257 #resolve #comment Fixed in revision r63482. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opgroups.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Tue May 27 21:10:45 2014 @@ -251,6 +251,7 @@ ULONG DirConf : 1; ULONG Executable : 1; ULONG SystemType : 1; + ULONG Rpl : 2; ULONG Dpl : 2; ULONG Present : 1; ULONG Size : 1; Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Tue May 27 21:10:45 2014 @@ -65,7 +65,7 @@ return FALSE; } - if ((!InstFetch && (GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl)) + if ((!InstFetch && (CachedDescriptor->Rpl > CachedDescriptor->Dpl)) || (Fast486GetCurrentPrivLevel(State) > CachedDescriptor->Dpl)) { Fast486Exception(State, FAST486_EXCEPTION_GP); @@ -132,7 +132,7 @@ return FALSE; } - if ((GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl) + if ((CachedDescriptor->Rpl > CachedDescriptor->Dpl) || (Fast486GetCurrentPrivLevel(State) > CachedDescriptor->Dpl)) { Fast486Exception(State, FAST486_EXCEPTION_GP); @@ -164,14 +164,26 @@ Fast486InterruptInternal(PFAST486_STATE State, USHORT SegmentSelector, ULONG Offset, - BOOLEAN InterruptGate) + ULONG GateType) { + BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) + || (GateType == FAST486_IDT_TRAP_GATE_32); + /* Check for protected mode */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) { FAST486_TSS Tss; USHORT OldSs = State->SegmentRegs[FAST486_REG_SS].Selector; ULONG OldEsp = State->GeneralRegs[FAST486_REG_ESP].Long; + + if (GateSize != (State->SegmentRegs[FAST486_REG_CS].Size)) + { + /* + * The gate size doesn't match the current operand size, so toggle + * the OPSIZE flag. + */ + State->PrefixFlags ^= FAST486_PREFIX_OPSIZE; + } /* Check if the interrupt handler is more privileged */ if (Fast486GetCurrentPrivLevel(State) > GET_SEGMENT_RPL(SegmentSelector)) @@ -257,7 +269,7 @@ /* Push the instruction pointer */ if (!Fast486StackPush(State, State->InstPtr.Long)) return FALSE; - if (InterruptGate) + if ((GateType == FAST486_IDT_INT_GATE) || (GateType == FAST486_IDT_INT_GATE_32)) { /* Disable interrupts after a jump to an interrupt gate handler */ State->Flags.If = FALSE; @@ -270,7 +282,7 @@ return FALSE; } - if (State->SegmentRegs[FAST486_REG_CS].Size) + if (GateSize) { /* 32-bit code segment, use EIP */ State->InstPtr.Long = Offset; Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Tue May 27 21:10:45 2014 @@ -159,7 +159,7 @@ PFAST486_STATE State, USHORT SegmentSelector, ULONG Offset, - BOOLEAN InterruptGate + ULONG GateType ); VOID Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Tue May 27 21:10:45 2014 @@ -542,24 +542,32 @@ { /* Loading a data segment */ - if (!GdtEntry.SystemType) - { - /* This is a special descriptor */ - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); - return FALSE; - } - - if ((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl) - || (Fast486GetCurrentPrivLevel(State) > GdtEntry.Dpl)) - { - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); - return FALSE; - } - - if (!GdtEntry.Present) - { - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); - return FALSE; + if (GET_SEGMENT_INDEX(Selector) != 0) + { + if (!GdtEntry.SystemType) + { + /* This is a special descriptor */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + if ((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl) + || (Fast486GetCurrentPrivLevel(State) > GdtEntry.Dpl)) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + if (!GdtEntry.Present) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); + return FALSE; + } + } + else + { + /* This is a NULL selector */ + RtlZeroMemory(&GdtEntry, sizeof(GdtEntry)); } } @@ -572,6 +580,7 @@ CachedDescriptor->DirConf = GdtEntry.DirConf; CachedDescriptor->Executable = GdtEntry.Executable; CachedDescriptor->SystemType = GdtEntry.SystemType; + CachedDescriptor->Rpl = GET_SEGMENT_RPL(Selector); CachedDescriptor->Dpl = GdtEntry.Dpl; CachedDescriptor->Present = GdtEntry.Present; CachedDescriptor->Size = GdtEntry.Size; Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Tue May 27 21:10:45 2014 @@ -3702,9 +3702,9 @@ } else { - USHORT Data; - - if (!Fast486FetchWord(State, &Data)) + SHORT Data; + + if (!Fast486FetchWord(State, (PUSHORT)&Data)) { /* Exception occurred */ return FALSE; @@ -3837,12 +3837,12 @@ FAST486_OPCODE_HANDLER(Fast486OpcodePushByteImm) { - UCHAR Data; + CHAR Data; /* Make sure this is the right instruction */ ASSERT(Opcode == 0x6A); - if (!Fast486FetchByte(State, &Data)) + if (!Fast486FetchByte(State, (PUCHAR)&Data)) { /* Exception occurred */ return FALSE; Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Tue May 27 21:10:45 2014 @@ -2018,10 +2018,13 @@ { UCHAR TableReg[6]; FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + BOOLEAN OperandSize, AddressSize; FAST486_SEG_REGS Segment = FAST486_REG_DS; + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + NO_LOCK_PREFIX(); + TOGGLE_OPSIZE(OperandSize); TOGGLE_ADSIZE(AddressSize); if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -2117,6 +2120,9 @@ State->Gdtr.Size = *((PUSHORT)TableReg); State->Gdtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); + /* In 16-bit mode the highest byte is masked out */ + if (!OperandSize) State->Gdtr.Address &= 0x00FFFFFF; + return TRUE; } @@ -2153,6 +2159,9 @@ State->Idtr.Size = *((PUSHORT)TableReg); State->Idtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); + /* In 16-bit mode the highest byte is masked out */ + if (!OperandSize) State->Idtr.Address &= 0x00FFFFFF; + return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue May 27 21:10:45 2014 @@ -441,6 +441,10 @@ /* Set the final zero */ *(DestBuffer++) = 0; + + /* Store the special program name tag */ + *(DestBuffer++) = LOWORD(DOS_PROGRAM_NAME_TAG); + *(DestBuffer++) = HIWORD(DOS_PROGRAM_NAME_TAG); /* Copy the program name after the environment block */ strcpy(DestBuffer, ProgramName); Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Tue May 27 21:10:45 2014 @@ -47,6 +47,7 @@ #define DOS_DIR_LENGTH 64 #define NUM_DRIVES ('Z' - 'A' + 1) #define DOS_CHAR_ATTRIBUTE 0x07 +#define DOS_PROGRAM_NAME_TAG 0x0001 enum DOS_ALLOC_STRATEGY {

1 0

[cwittich] 63481: [setupapi] sync setupapi\dirid.c with wine patch by Samuel Serapion CORE-7663
by cwittich＠svn.reactos.org 27 May '14

27 May '14

Author: cwittich Date: Tue May 27 20:33:21 2014 New Revision: 63481 URL: http://svn.reactos.org/svn/reactos?rev=63481&view=rev Log: [setupapi] sync setupapi\dirid.c with wine patch by Samuel Serapion CORE-7663 Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/setupapi/dirid.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Tue May 27 20:33:21 2014 @@ -40,7 +40,7 @@ set_module_type(setupapi win32dll UNICODE) target_link_libraries(setupapi uuid wine ${PSEH_LIB}) -add_delay_importlibs(setupapi shell32 wintrust) +add_delay_importlibs(setupapi shell32 winspool wintrust) add_importlibs(setupapi msvcrt Modified: trunk/reactos/dll/win32/setupapi/dirid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/dirid.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/dirid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/dirid.c [iso-8859-1] Tue May 27 20:33:21 2014 @@ -70,6 +70,7 @@ WCHAR buffer[MAX_PATH+32], *str; int len; + DWORD needed; switch(dirid) { @@ -122,8 +123,14 @@ return get_csidl_dir(CSIDL_PROFILE); case DIRID_LOADER: return C_Root; /* FIXME */ + case DIRID_PRINTPROCESSOR: + if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)buffer, sizeof(buffer), &needed)) + { + WARN( "cannot retrieve print processor directory\n" ); + return get_unknown_dirid(); + } + break; case DIRID_COLOR: /* FIXME */ - case DIRID_PRINTPROCESSOR: /* FIXME */ default: FIXME( "unknown dirid %d\n", dirid ); return get_unknown_dirid(); Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Tue May 27 20:33:21 2014 @@ -31,6 +31,8 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <wingdi.h> +#include <winspool.h> #include <wincon.h> #include <objbase.h> #include <cfgmgr32.h>

1 0

[akhaldi] 63480: [CMAKE] * Convert the hives from UTF-8 to UTF16 as part of the build process. CORE-7703 CORE-8221
by akhaldi＠svn.reactos.org 27 May '14

27 May '14

Author: akhaldi Date: Tue May 27 19:42:15 2014 New Revision: 63480 URL: http://svn.reactos.org/svn/reactos?rev=63480&view=rev Log: [CMAKE] * Convert the hives from UTF-8 to UTF16 as part of the build process. CORE-7703 CORE-8221 Modified: trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/boot/bootdata/hivecls.inf (contents, props changed) trunk/reactos/boot/bootdata/hivedef.inf (contents, props changed) trunk/reactos/boot/bootdata/hivesft.inf (contents, props changed) trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/cmake/CMakeMacros.cmake [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re…

1 0

[dquintana] 63479: [BROWSEUI] * Remove a call that shouldn't even be working in Windows, and was completely unnecessary. Fixes explorer-new navigation history in ReactOS. * Added some debug traces....
by dquintana＠svn.reactos.org 27 May '14

27 May '14

Author: dquintana Date: Tue May 27 17:55:41 2014 New Revision: 63479 URL: http://svn.reactos.org/svn/reactos?rev=63479&view=rev Log: [BROWSEUI] * Remove a call that shouldn't even be working in Windows, and was completely unnecessary. Fixes explorer-new navigation history in ReactOS. * Added some debug traces. CORE-8173 Modified: branches/shell-experiments/dll/win32/browseui/travellog.cpp Modified: branches/shell-experiments/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/travellog.cpp [iso-8859-1] Tue May 27 17:55:41 2014 @@ -126,8 +126,9 @@ HRESULT hResult; hResult = ILGetDisplayNameEx(NULL, fPIDL, pwzText, ILGDN_NORMAL) ? S_OK : S_FALSE; - if (FAILED(hResult)) - return hResult; + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + return S_OK; } @@ -142,14 +143,16 @@ CComPtr<IStream> globalStream; HRESULT hResult; + TRACE("CTravelEntry::Invoke for IUnknown punk=%p\n", punk); + hResult = punk->QueryInterface(IID_PPV_ARG(IPersistHistory, &persistHistory)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = CreateStreamOnHGlobal(fPersistState, FALSE, &globalStream); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = persistHistory->LoadHistory(globalStream, NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -160,34 +163,43 @@ CComPtr<IPersistHistory> persistHistory; CComPtr<IStream> globalStream; WINDOWDATA windowData; - HGLOBAL globalStorage; - HRESULT hResult; + HRESULT hResult; + + TRACE("CTravelEntry::Update for IUnknown punk=%p, fIsLocalAnchor=%s\n", punk, fIsLocalAnchor ? "TRUE" : "FALSE"); + + + WCHAR wch[MAX_PATH * 2]; + GetToolTipText(punk, wch); + TRACE("Updating entry with display name: %S\n", wch); ILFree(fPIDL); fPIDL = NULL; GlobalFree(fPersistState); fPersistState = NULL; hResult = punk->QueryInterface(IID_PPV_ARG(ITravelLogClient, &travelLogClient)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = punk->QueryInterface(IID_PPV_ARG(IPersistHistory, &persistHistory)); - if (FAILED(hResult)) - return hResult; - globalStorage = GlobalAlloc(GMEM_FIXED, 0); - hResult = CreateStreamOnHGlobal(globalStorage, FALSE, &globalStream); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = CreateStreamOnHGlobal(NULL, FALSE, &globalStream); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = persistHistory->SaveHistory(globalStream); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = travelLogClient->GetWindowData(globalStream, &windowData); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; fPIDL = windowData.pidl; // TODO: Properly free the windowData hResult = GetHGlobalFromStream(globalStream, &fPersistState); - if (FAILED(hResult)) - return hResult; + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + GetToolTipText(punk, wch); + TRACE("Updated entry display name is now: %S\n", wch); + return S_OK; } @@ -198,6 +210,9 @@ *ppidl = ILClone(fPIDL); if (*ppidl == NULL) return E_OUTOFMEMORY; + + TRACE("CTravelEntry::GetPidl returning ppidl=%p\n", *ppidl); + return S_OK; } @@ -209,6 +224,7 @@ fMaximumSize = 0; fCurrentSize = 0; fEntryCount = 0; + TRACE("CTravelLog created\n"); } CTravelLog::~CTravelLog() @@ -223,19 +239,25 @@ anEntry->Release(); anEntry = next; } + TRACE("CTravelLog destroyed\n"); } HRESULT CTravelLog::Initialize() { + FIXME("CTravelLog::Initialize using hardcoded fMaximumSize.\n"); fMaximumSize = 1024 * 1024; // TODO: change to read this from registry // Software\Microsoft\Windows\CurrentVersion\Explorer\TravelLog // MaxSize return S_OK; } -HRESULT CTravelLog::FindRelativeEntry(int offset, CTravelEntry **foundEntry) +HRESULT CTravelLog::FindRelativeEntry(int _offset, CTravelEntry **foundEntry) { CTravelEntry *curEntry; + int offset = _offset; + + if (foundEntry == NULL) + return E_INVALIDARG; *foundEntry = NULL; curEntry = fCurrentEntry; @@ -257,7 +279,11 @@ } if (curEntry == NULL) return E_INVALIDARG; + *foundEntry = curEntry; + + TRACE("CTravelLog::FindRelativeEntry for offset %d, returning %p\n", offset, *foundEntry); + return S_OK; } @@ -265,6 +291,10 @@ { CTravelEntry *saveNext; long itemSize; + + TRACE("CTravelLog::DeleteChain deleting chain starting at %p\n", startHere); + + long startEntryCount = fEntryCount; if (startHere->fPreviousEntry != NULL) { @@ -285,17 +315,21 @@ startHere = saveNext; fEntryCount--; } + + TRACE("CTravelLog::DeleteChain chain of %d items deleted\n", startEntryCount - fEntryCount); } void CTravelLog::AppendEntry(CTravelEntry *afterEntry, CTravelEntry *newEntry) { if (afterEntry == NULL) { + TRACE("CTravelLog::AppendEntry appending %p after NULL. Resetting head and tail\n", newEntry); fListHead = newEntry; fListTail = newEntry; } else { + TRACE("CTravelLog::AppendEntry appending %p after %p\n", newEntry, afterEntry); newEntry->fNextEntry = afterEntry->fNextEntry; afterEntry->fNextEntry = newEntry; newEntry->fPreviousEntry = afterEntry; @@ -311,6 +345,8 @@ { CComObject<CTravelEntry> *newEntry; long itemSize; + + TRACE("CTravelLog::AddEntry for IUnknown punk=%p, fIsLocalAnchor=%s\n", punk, fIsLocalAnchor ? "TRUE" : "FALSE"); if (punk == NULL) return E_INVALIDARG; @@ -346,12 +382,14 @@ CTravelEntry *destinationEntry; HRESULT hResult; + TRACE("CTravelLog::Travel for IUnknown punk=%p at offset=%d\n", punk, iOffset); + hResult = FindRelativeEntry(iOffset, &destinationEntry); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; fCurrentEntry = destinationEntry; hResult = destinationEntry->Invoke(punk); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -360,11 +398,17 @@ { CTravelEntry *destinationEntry; HRESULT hResult; - + hResult = FindRelativeEntry(iOffset, &destinationEntry); - if (FAILED(hResult)) - return hResult; - return destinationEntry->QueryInterface(IID_PPV_ARG(ITravelEntry, ppte)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = destinationEntry->QueryInterface(IID_PPV_ARG(ITravelEntry, ppte)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + TRACE("CTravelLog::GetTravelEntry for IUnknown punk=%p at offset=%d returning %p\n", punk, iOffset, *ppte); + + return hResult; } HRESULT STDMETHODCALLTYPE CTravelLog::FindTravelEntry(IUnknown *punk, LPCITEMIDLIST pidl, ITravelEntry **ppte) @@ -373,6 +417,9 @@ return E_POINTER; if (punk == NULL || pidl == NULL) return E_INVALIDARG; + + UNIMPLEMENTED; + return E_NOTIMPL; } @@ -388,10 +435,10 @@ if (punk == NULL || cchText == 0) return E_INVALIDARG; hResult = FindRelativeEntry(iOffset, &destinationEntry); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = destinationEntry->GetToolTipText(punk, tempString); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (iOffset < 0) { @@ -402,6 +449,9 @@ wcscpy(templateString, L"Forward to %s"); } _snwprintf(pwzText, cchText, templateString, tempString); + + TRACE("CTravelLog::GetToolTipText for IUnknown punk=%p at offset=%d returning L\"%S\"\n", punk, iOffset, pwzText); + return S_OK; } @@ -432,6 +482,8 @@ MENUITEMINFO menuItemInfo; wchar_t itemTextBuffer[MAX_PATH * 2]; HRESULT hResult; + + TRACE("CTravelLog::InsertMenuEntries for IUnknown punk=%p, nPos=%d, idFirst=%d, idLast=%d\n", punk); // TLMENUF_BACK - include back entries // TLMENUF_INCLUDECURRENT - include current entry, if TLMENUF_CHECKCURRENT then check the entry @@ -467,6 +519,7 @@ if (SUCCEEDED(hResult)) { FixAmpersands(itemTextBuffer); + TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID); if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo)) { nPos++; @@ -487,6 +540,7 @@ if (SUCCEEDED(hResult)) { FixAmpersands(itemTextBuffer); + TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID); if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo)) { nPos++; @@ -507,6 +561,7 @@ FixAmpersands(itemTextBuffer); if ((dwFlags & TLMENUF_CHECKCURRENT) != 0) menuItemInfo.fState |= MFS_CHECKED; + TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID); if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo)) { nPos++; @@ -527,6 +582,7 @@ if (SUCCEEDED(hResult)) { FixAmpersands(itemTextBuffer); + TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID); if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo)) { nPos++; @@ -545,6 +601,7 @@ return E_POINTER; *pptl = NULL; // duplicate the log + UNIMPLEMENTED; return E_NOTIMPL; } @@ -558,6 +615,7 @@ HRESULT STDMETHODCALLTYPE CTravelLog::Revert() { // remove the current entry? + UNIMPLEMENTED; return E_NOTIMPL; } @@ -573,13 +631,13 @@ if (theTravelLog == NULL) return E_OUTOFMEMORY; hResult = theTravelLog->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theTravelLog; return hResult; } hResult = theTravelLog->Initialize(); - if (FAILED(hResult)) - return hResult; - return S_OK; -} + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + return S_OK; +}

1 0

[ekohl] 63478: [SETUP] Formatting. No code changes!
by ekohl＠svn.reactos.org 27 May '14

27 May '14

Author: ekohl Date: Tue May 27 11:49:14 2014 New Revision: 63478 URL: http://svn.reactos.org/svn/reactos?rev=63478&view=rev Log: [SETUP] Formatting. No code changes! Modified: trunk/reactos/base/setup/setup/setup.c Modified: trunk/reactos/base/setup/setup/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/setup/setup.c?r… ============================================================================== --- trunk/reactos/base/setup/setup/setup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/setup/setup.c [iso-8859-1] Tue May 27 11:49:14 2014 @@ -36,112 +36,122 @@ /* FUNCTIONS ****************************************************************/ -LPTSTR lstrchr(LPCTSTR s, TCHAR c) +LPTSTR +lstrchr( + LPCTSTR s, + TCHAR c) { - while (*s) + while (*s) { - if (*s == c) - return (LPTSTR)s; - s++; + if (*s == c) + return (LPTSTR)s; + s++; } - if (c == (TCHAR)0) - return (LPTSTR)s; + if (c == (TCHAR)0) + return (LPTSTR)s; - return (LPTSTR)NULL; + return (LPTSTR)NULL; } -static VOID -RunNewSetup (HINSTANCE hInstance) + +static +VOID +RunNewSetup( + HINSTANCE hInstance) { - HMODULE hDll; - PINSTALL_REACTOS InstallReactOS; + HMODULE hDll; + PINSTALL_REACTOS InstallReactOS; - hDll = LoadLibrary (TEXT("syssetup")); - if (hDll == NULL) + hDll = LoadLibrary(TEXT("syssetup")); + if (hDll == NULL) { - DPRINT("Failed to load 'syssetup'!\n"); - return; + DPRINT("Failed to load 'syssetup'!\n"); + return; } - DPRINT("Loaded 'syssetup'!\n"); - InstallReactOS = (PINSTALL_REACTOS)GetProcAddress (hDll, "InstallReactOS"); - - if (InstallReactOS == NULL) + DPRINT("Loaded 'syssetup'!\n"); + InstallReactOS = (PINSTALL_REACTOS)GetProcAddress(hDll, "InstallReactOS"); + if (InstallReactOS == NULL) { - DPRINT("Failed to get address for 'InstallReactOS()'!\n"); - FreeLibrary (hDll); - return; + DPRINT("Failed to get address for 'InstallReactOS()'!\n"); + FreeLibrary(hDll); + return; } - InstallReactOS (hInstance); + InstallReactOS(hInstance); - FreeLibrary (hDll); + FreeLibrary(hDll); } -static VOID -RunLiveCD (HINSTANCE hInstance) + +static +VOID +RunLiveCD( + HINSTANCE hInstance) { - HMODULE hDll; - PINSTALL_REACTOS InstallLiveCD; + HMODULE hDll; + PINSTALL_REACTOS InstallLiveCD; - hDll = LoadLibrary (TEXT("syssetup")); - if (hDll == NULL) + hDll = LoadLibrary(TEXT("syssetup")); + if (hDll == NULL) { - DPRINT("Failed to load 'syssetup'!\n"); - return; + DPRINT("Failed to load 'syssetup'!\n"); + return; } - DPRINT("Loaded 'syssetup'!\n"); - InstallLiveCD = (PINSTALL_REACTOS)GetProcAddress (hDll, "InstallLiveCD"); - - if (InstallLiveCD == NULL) + DPRINT("Loaded 'syssetup'!\n"); + InstallLiveCD = (PINSTALL_REACTOS)GetProcAddress(hDll, "InstallLiveCD"); + if (InstallLiveCD == NULL) { - DPRINT("Failed to get address for 'InstallReactOS()'!\n"); - FreeLibrary (hDll); - return; + DPRINT("Failed to get address for 'InstallReactOS()'!\n"); + FreeLibrary(hDll); + return; } - InstallLiveCD (hInstance); + InstallLiveCD(hInstance); - FreeLibrary (hDll); + FreeLibrary(hDll); } -int WINAPI -_tWinMain (HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nShowCmd) + +int +WINAPI +_tWinMain( + HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nShowCmd) { - LPTSTR CmdLine; - LPTSTR p; + LPTSTR CmdLine; + LPTSTR p; - CmdLine = GetCommandLine (); + CmdLine = GetCommandLine(); - DPRINT("CmdLine: <%s>\n",CmdLine); + DPRINT("CmdLine: <%s>\n",CmdLine); - p = lstrchr (CmdLine, TEXT('-')); - if (p == NULL) - return 0; + p = lstrchr(CmdLine, TEXT('-')); + if (p == NULL) + return 0; - if (!lstrcmpi (p, TEXT("-newsetup"))) + if (!lstrcmpi(p, TEXT("-newsetup"))) { - RunNewSetup (hInstance); + RunNewSetup(hInstance); } - else if (!lstrcmpi (p, TEXT("-mini"))) + else if (!lstrcmpi(p, TEXT("-mini"))) { - RunLiveCD (hInstance); + RunLiveCD(hInstance); } #if 0 /* Add new setup types here */ - else if (...) + else if (...) { } #endif - return 0; + return 0; } /* EOF */

1 0

[jimtabor] 63477: [Win32k] - More tweaks for MDI drawing. Tested our explorer, winefile and Vide2 from http://vgui.sourceforge.net/. Help is needed to fix MDI icon system menu loading, updating and...
by jimtabor＠svn.reactos.org 26 May '14

26 May '14

Author: jimtabor Date: Mon May 26 19:53:25 2014 New Revision: 63477 URL: http://svn.reactos.org/svn/reactos?rev=63477&view=rev Log: [Win32k] - More tweaks for MDI drawing. Tested our explorer, winefile and Vide2 from http://vgui.sourceforge.net/. Help is needed to fix MDI icon system menu loading, updating and moving. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon May 26 19:53:25 2014 @@ -362,7 +362,6 @@ if (WndTo) UserDerefObjectCo(WndTo); } - VOID FASTCALL WinPosInitInternalPos(PWND Wnd, RECTL *RestoreRect) { @@ -623,12 +622,13 @@ ASSERT_REFS_CO(parent); IntGetClientRect( parent, &rectParent ); - // FIXME: Support gspv.mm.iArrange. + // FIXME: Support Minimize Metrics gspv.mm.iArrange. + // Default: ARW_BOTTOMLEFT x = rectParent.left; y = rectParent.bottom; - xspacing = (UserGetSystemMetrics(SM_CXMINSPACING)/2)+UserGetSystemMetrics(SM_CXBORDER); - yspacing = (UserGetSystemMetrics(SM_CYMINSPACING)/2)+UserGetSystemMetrics(SM_CYBORDER); + xspacing = UserGetSystemMetrics(SM_CXMINIMIZED); + yspacing = UserGetSystemMetrics(SM_CYMINIMIZED); Child = parent->spwndChild; while(Child) @@ -645,7 +645,7 @@ Child->InternalPos.IconPos.y = sy; Child->InternalPos.flags |= WPF_MININIT; - co_WinPosSetWindowPos( Child, 0, sx, sy, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_ASYNCWINDOWPOS); + co_WinPosSetWindowPos( Child, 0, sx, sy, xspacing, yspacing, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_ASYNCWINDOWPOS); UserDerefObjectCo(Child); @@ -682,12 +682,13 @@ } IntGetClientRect( pwndParent, &rectParent ); - // FIXME: Support gspv.mm.iArrange. + // FIXME: Support Minimize Metrics gspv.mm.iArrange. + // Default: ARW_BOTTOMLEFT x = rectParent.left; y = rectParent.bottom; - xspacing = (UserGetSystemMetrics(SM_CXMINSPACING)/2)+UserGetSystemMetrics(SM_CXBORDER); - yspacing = (UserGetSystemMetrics(SM_CYMINSPACING)/2)+UserGetSystemMetrics(SM_CYBORDER); + xspacing = UserGetSystemMetrics(SM_CXMINIMIZED); + yspacing = UserGetSystemMetrics(SM_CYMINIMIZED); // Set to default position when minimized. Pos->x = x + UserGetSystemMetrics(SM_CXBORDER); @@ -786,10 +787,6 @@ if (!(old_style & WS_MINIMIZE)) SwpFlags |= SWP_STATECHANGED; - /*ERR("Minimize: %d,%d %dx%d\n", - wpl.ptMinPosition.x, wpl.ptMinPosition.y, UserGetSystemMetrics(SM_CXMINIMIZED), - UserGetSystemMetrics(SM_CYMINIMIZED)); - */ RECTL_vSetRect(NewPos, wpl.ptMinPosition.x, wpl.ptMinPosition.y, wpl.ptMinPosition.x + UserGetSystemMetrics(SM_CXMINIMIZED), wpl.ptMinPosition.y + UserGetSystemMetrics(SM_CYMINIMIZED)); @@ -814,7 +811,7 @@ if (!(old_style & WS_MAXIMIZE)) SwpFlags |= SWP_STATECHANGED; RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, -// wpl.ptMaxPosition.x + Size.x, wpl.ptMaxPosition.y + Size.y); + //wpl.ptMaxPosition.x + Size.x, wpl.ptMaxPosition.y + Size.y); Size.x, Size.y); break; } @@ -830,26 +827,18 @@ old_style = IntSetStyle( Wnd, 0, WS_MINIMIZE | WS_MAXIMIZE ); if (old_style & WS_MINIMIZE) { - if (Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED) { co_WinPosGetMinMaxInfo(Wnd, &Size, &wpl.ptMaxPosition, NULL, NULL); IntSetStyle( Wnd, WS_MAXIMIZE, 0 ); SwpFlags |= SWP_STATECHANGED; - /*ERR("Restore to Max: %d,%d %dx%d\n", - wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); - */ RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, -// wpl.ptMaxPosition.x + Size.x, wpl.ptMaxPosition.y + Size.y); - Size.x, Size.y); + wpl.ptMaxPosition.x + Size.x, wpl.ptMaxPosition.y + Size.y); break; } else { *NewPos = wpl.rcNormalPosition; - /*ERR("Restore Max: %d,%d %dx%d\n", - NewPos->left, NewPos->top, NewPos->right - NewPos->left, NewPos->bottom - NewPos->top); - */ NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -864,9 +853,6 @@ SwpFlags |= SWP_STATECHANGED; Wnd->InternalPos.flags &= ~WPF_RESTORETOMAXIMIZED; *NewPos = wpl.rcNormalPosition; - /*ERR("Restore Min: %d,%d %dx%d\n", - NewPos->left, NewPos->top, NewPos->right - NewPos->left, NewPos->bottom - NewPos->top); - */ NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -1284,8 +1270,8 @@ { if (Window->style & WS_MINIMIZE) { - WindowRect->right = WindowRect->left + (UserGetSystemMetrics(SM_CXMINSPACING)/2)+UserGetSystemMetrics(SM_CXBORDER); - WindowRect->bottom = WindowRect->top + (UserGetSystemMetrics(SM_CYMINSPACING)/2)+UserGetSystemMetrics(SM_CYBORDER); + WindowRect->right = WindowRect->left + UserGetSystemMetrics(SM_CXMINIMIZED); + WindowRect->bottom = WindowRect->top + UserGetSystemMetrics(SM_CYMINIMIZED); } else {

1 0

[akhaldi] 63476: [NTDLL] * Zap some exports that do not exist in native. * Reorder some exports. * Add the missing ones. They are commented out and will be added on-demand. CORE-8174
by akhaldi＠svn.reactos.org 26 May '14

26 May '14

Author: akhaldi Date: Mon May 26 19:17:48 2014 New Revision: 63476 URL: http://svn.reactos.org/svn/reactos?rev=63476&view=rev Log: [NTDLL] * Zap some exports that do not exist in native. * Reorder some exports. * Add the missing ones. They are commented out and will be added on-demand. CORE-8174 Modified: trunk/reactos/dll/ntdll/def/ntdll.spec Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Mon May 26 19:17:48 2014 @@ -1,4 +1,15 @@ - +;@ stdcall PropertyLengthAsVariant(ptr long long long) +;@ stdcall RtlConvertPropertyToVariant(ptr long ptr ptr) +;@ stdcall RtlConvertVariantToProperty(ptr long ptr ptr ptr long ptr) +@ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr) +@ fastcall RtlDeactivateActivationContextUnsafeFast(ptr) +@ stdcall RtlInterlockedPushListSList(ptr ptr ptr long) +@ fastcall -arch=i386 RtlUlongByteSwap(long) +@ fastcall -ret64 RtlUlonglongByteSwap(double) +@ fastcall -arch=i386 RtlUshortByteSwap(long) +@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListEnd() +@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListFault() +@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListResume() @ stdcall CsrAllocateCaptureBuffer(long long) @ stdcall CsrAllocateMessagePointer(ptr long ptr) @ stdcall CsrCaptureMessageBuffer(ptr ptr long ptr) @@ -32,12 +43,42 @@ @ stdcall DbgUiStopDebugging(ptr) @ stdcall DbgUiWaitStateChange(ptr ptr) @ stdcall DbgUserBreakPoint() +# EtwControlTraceA +# EtwControlTraceW +# EtwCreateTraceInstanceId +# EtwEnableTrace +# EtwEnumerateTraceGuids +# EtwFlushTraceA +# EtwFlushTraceW +# EtwGetTraceEnableFlags +# EtwGetTraceEnableLevel +# EtwGetTraceLoggerHandle +# EtwNotificationRegistrationA +# EtwNotificationRegistrationW +# EtwQueryAllTracesA +# EtwQueryAllTracesW +# EtwQueryTraceA +# EtwQueryTraceW +# EtwReceiveNotificationsA +# EtwReceiveNotificationsW +# EtwRegisterTraceGuidsA +# EtwRegisterTraceGuidsW +# EtwStartTraceA +# EtwStartTraceW +# EtwStopTraceA +# EtwStopTraceW +# EtwTraceEvent +# EtwTraceEventInstance +# EtwTraceMessage +# EtwTraceMessageVa +# EtwUnregisterTraceGuids +# EtwUpdateTraceA +# EtwUpdateTraceW +# EtwpGetTraceBuffer +# EtwpSetHWConfigFunction @ stdcall -arch=i386 KiFastSystemCall() @ stdcall -arch=i386 KiFastSystemCallRet() @ stdcall -arch=i386 KiIntSystemCall() -@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListEnd() -@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListFault() -@ stdcall -arch=i386,x86_64 ExpInterlockedPopEntrySListResume() @ stdcall KiRaiseUserExceptionDispatcher() @ stdcall KiUserApcDispatcher(ptr ptr ptr ptr) @ stdcall KiUserCallbackDispatcher(ptr ptr long) ; CHECKME @@ -69,6 +110,7 @@ @ stdcall LdrOpenImageFileOptionsKey(ptr long ptr) ; 5.2 SP1 and higher @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr str long ptr long ptr) +;@ stdcall LdrQueryImageFileExecutionOptionsEx(ptr ptr long ptr long ptr long) @ stdcall LdrQueryImageFileKeyOption(ptr ptr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) ;@ stdcall LdrSetAppCompatDllRedirectionCallback @@ -148,6 +190,7 @@ @ stdcall NtDelayExecution(long ptr) @ stdcall NtDeleteAtom(long) @ stdcall NtDeleteBootEntry(long) +# NtDeleteDriverEntry @ stdcall NtDeleteFile(ptr) @ stdcall NtDeleteKey(long) @ stdcall NtDeleteObjectAuditAlarm(ptr ptr long) @@ -157,6 +200,7 @@ @ stdcall NtDuplicateObject(long long long ptr long long long) @ stdcall NtDuplicateToken(long long long long long long) @ stdcall NtEnumerateBootEntries(ptr ptr) +;@ stdcall NtEnumerateDriverEntries(ptr ptr) @ stdcall NtEnumerateKey (long long long long long long) @ stdcall NtEnumerateSystemEnvironmentValuesEx(long ptr long) @ stdcall NtEnumerateValueKey(long long long long long long) @@ -188,6 +232,7 @@ @ stdcall NtLoadDriver(ptr) @ stdcall NtLoadKey2(ptr ptr long) @ stdcall NtLoadKey(ptr ptr) +;@ stdcall NtLoadKeyEx(ptr ptr long ptr) @ stdcall NtLockFile(long long ptr ptr ptr ptr ptr ptr long long) @ stdcall NtLockProductActivationKeys(ptr ptr) @ stdcall NtLockRegistryKey(ptr) @@ -198,6 +243,7 @@ @ stdcall NtMapUserPhysicalPagesScatter(ptr ptr ptr) @ stdcall NtMapViewOfSection(long long ptr long long ptr ptr long long long) @ stdcall NtModifyBootEntry(ptr) +# NtModifyDriverEntry @ stdcall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) @ stdcall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) @ stdcall NtNotifyChangeMultipleKeys(ptr long ptr ptr ptr ptr ptr long long ptr long long) @@ -236,6 +282,7 @@ @ stdcall NtQueryDefaultUILanguage(ptr) @ stdcall NtQueryDirectoryFile(long long ptr ptr ptr ptr long long long ptr long) @ stdcall NtQueryDirectoryObject(long ptr long long long ptr ptr) +;@ stdcall NtQueryDriverEntryOrder(ptr ptr) @ stdcall NtQueryEaFile(long ptr ptr long long ptr long ptr long) @ stdcall NtQueryEvent(long long ptr long ptr) @ stdcall NtQueryFullAttributesFile(ptr ptr) @@ -254,6 +301,7 @@ @ stdcall NtQueryMutant(long long ptr long ptr) @ stdcall NtQueryObject(long long long long long) @ stdcall NtQueryOpenSubKeys(ptr ptr) +;@ stdcall NtQueryOpenSubKeysEx(ptr long ptr ptr) @ stdcall NtQueryPerformanceCounter(ptr ptr) @ stdcall NtQueryPortInformationProcess() @ stdcall NtQueryQuotaInformationFile(ptr ptr ptr long long ptr long ptr long) @@ -309,6 +357,7 @@ @ stdcall NtSetDefaultHardErrorPort(ptr) @ stdcall NtSetDefaultLocale(long long) @ stdcall NtSetDefaultUILanguage(long) +;@ stdcall NtSetDriverEntryOrder(ptr ptr) @ stdcall NtSetEaFile(long ptr ptr long) @ stdcall NtSetEvent(long long) @ stdcall NtSetEventBoostPriority(ptr) @@ -354,6 +403,7 @@ @ stdcall NtTraceEvent(long long long ptr) @ stdcall NtTranslateFilePath(ptr long ptr long) @ stdcall NtUnloadDriver(ptr) +;@ stdcall NtUnloadKey2(ptr long) @ stdcall NtUnloadKey(long) @ stdcall NtUnloadKeyEx(ptr ptr) @ stdcall NtUnlockFile(long ptr ptr ptr ptr) @@ -362,6 +412,7 @@ @ stdcall NtVdmControl(long ptr) @ stdcall NtWaitForDebugEvent(ptr long ptr ptr) @ stdcall NtWaitForKeyedEvent(ptr ptr long ptr) +;@ stdcall NtWaitForMultipleObjects32(long ptr long long ptr) @ stdcall NtWaitForMultipleObjects(long ptr long long ptr) @ stdcall NtWaitForSingleObject(long long long) @ stdcall NtWaitHighEventPair(ptr) @@ -375,18 +426,14 @@ ;@ stdcall PfxInitialize ;@ stdcall PfxInsertPrefix ;@ stdcall PfxRemovePrefix -;@ stdcall PropertyLengthAsVariant @ stdcall RtlAbortRXact(ptr) @ stdcall RtlAbsoluteToSelfRelativeSD(ptr ptr ptr) @ stdcall RtlAcquirePebLock() @ stdcall RtlAcquirePrivilege(ptr long long ptr) @ stdcall RtlAcquireResourceExclusive(ptr long) @ stdcall RtlAcquireResourceShared(ptr long) -@ stdcall RtlAcquireSRWLockExclusive(ptr) -@ stdcall RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) -@ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) @ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @@ -401,9 +448,7 @@ @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) ;@ stdcall RtlAddCompoundAce -;@ stdcall RtlAddRange ; 5.0 and 5.1 only @ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long long) -;@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) @ stdcall RtlAddRefActivationContext(ptr) @ stdcall RtlAddRefMemoryStream(ptr) @ stdcall RtlAddVectoredContinueHandler(long ptr) @@ -454,19 +499,16 @@ @ stdcall RtlConsoleMultiByteToUnicodeN(ptr long ptr ptr long ptr) @ stdcall RtlConvertExclusiveToShared(ptr) @ stdcall -arch=win32 -ret64 RtlConvertLongToLargeInteger(long) -;@ stdcall RtlConvertPropertyToVariant @ stdcall RtlConvertSharedToExclusive(ptr) @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) @ stdcall RtlConvertToAutoInheritSecurityObject(ptr ptr ptr ptr long ptr) ;@ stdcall RtlConvertUiListToApiList @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) -;@ stdcall RtlConvertVariantToProperty @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) ;@ stdcall RtlCopyMappedMemory @ stdcall RtlCopyMemoryStreamTo(ptr ptr int64 ptr ptr) @ stdcall RtlCopyOutOfProcessMemoryStreamTo(ptr ptr int64 ptr ptr) RtlCopyMemoryStreamTo -;@ stdcall RtlCopyRangeList ; 5.0 and 5.1 only @ stdcall RtlCopySecurityDescriptor(ptr ptr) @ stdcall RtlCopySid(long ptr ptr) @ stdcall RtlCopySidAndAttributesArray(long ptr long ptr ptr ptr ptr) @@ -496,7 +538,7 @@ @ stdcall RtlCutoverTimeToSystemTime(ptr ptr ptr long) @ stdcall RtlDeNormalizeProcessParams(ptr) @ stdcall RtlDeactivateActivationContext(long long) -@ fastcall RtlDeactivateActivationContextUnsafeFast(ptr) +# RtlDebugPrintTimes @ stdcall RtlDecodePointer(ptr) @ stdcall RtlDecodeSystemPointer(ptr) RtlEncodeSystemPointer @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @@ -510,8 +552,6 @@ @ stdcall RtlDeleteElementGenericTableAvl(ptr ptr) @ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) @ stdcall RtlDeleteNoSplay(ptr ptr) -@ stdcall RtlDeleteOwnersRanges(ptr ptr) -@ stdcall RtlDeleteRange(ptr long long long long ptr) @ stdcall RtlDeleteRegistryValue(long ptr ptr) @ stdcall RtlDeleteResource(ptr) @ stdcall RtlDeleteSecurityObject(ptr) @@ -579,18 +619,13 @@ @ stdcall RtlFindClearBitsAndSet(ptr long long) @ stdcall RtlFindClearRuns(ptr ptr long long) @ stdcall RtlFindLastBackwardRunClear(ptr long ptr) -;@ stdcall RtlFindLastBackwardRunSet(ptr long ptr) @ stdcall RtlFindLeastSignificantBit(double) @ stdcall RtlFindLongestRunClear(ptr long) -@ stdcall RtlFindLongestRunSet(ptr long) @ stdcall RtlFindMessage(long long long long ptr) @ stdcall RtlFindMostSignificantBit(double) @ stdcall RtlFindNextForwardRunClear(ptr long ptr) -;@ stdcall RtlFindNextForwardRunSet(ptr long ptr) -@ stdcall RtlFindRange(ptr long long long long long long long long ptr ptr ptr) @ stdcall RtlFindSetBits(ptr long long) @ stdcall RtlFindSetBitsAndClear(ptr long long) -;@ stdcall RtlFindSetRuns(ptr ptr long long) @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) @ stdcall RtlFlushSecureMemoryCache(ptr ptr) @@ -602,7 +637,6 @@ @ stdcall RtlFreeHandle(ptr ptr) @ stdcall RtlFreeHeap(long long long) @ stdcall RtlFreeOemString(ptr) -@ stdcall RtlFreeRangeList(ptr) @ stdcall RtlFreeSid(long) @ stdcall RtlFreeThreadActivationContextStack() @ stdcall RtlFreeUnicodeString(ptr) @@ -621,7 +655,6 @@ @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) @ stdcall RtlGetElementGenericTableAvl(ptr long) -@ stdcall RtlGetFirstRange(ptr ptr ptr) ;@ stdcall RtlGetFrame @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) @ stdcall RtlGetFullPathName_UstrEx(ptr ptr ptr ptr ptr ptr ptr ptr) @@ -633,12 +666,10 @@ @ stdcall RtlGetLengthWithoutTrailingPathSeperators(long ptr ptr) RtlGetLengthWithoutTrailingPathSeparators @ stdcall RtlGetLongestNtPathLength() @ stdcall RtlGetNativeSystemInformation(long long long long) NtQuerySystemInformation -@ stdcall RtlGetNextRange(ptr ptr long) @ stdcall RtlGetNtGlobalFlags() @ stdcall RtlGetNtProductType(ptr) @ stdcall RtlGetNtVersionNumbers(ptr ptr ptr) @ stdcall RtlGetOwnerSecurityDescriptor(ptr ptr ptr) -;@ stdcall RtlGetProductInfo(long long long long ptr) @ stdcall RtlGetProcessHeaps(long ptr) @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetSecurityDescriptorRMControl(ptr ptr) @@ -669,19 +700,17 @@ @ stdcall RtlInitializeContext(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) -;@ stdcall RtlInitializeCriticalSectionEx(ptr long long) @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeHandleTable(long long ptr) @ stdcall RtlInitializeRXact(ptr long ptr) -@ stdcall RtlInitializeRangeList(ptr) @ stdcall RtlInitializeResource(ptr) @ stdcall RtlInitializeSListHead(ptr) @ stdcall RtlInitializeSid(ptr ptr long) -@ stdcall RtlInitializeSRWLock(ptr) -;@ stdcall RtlInitializeStackTraceDataBase ; 5.1 SP2 and SP3, and 5.2 only @ stdcall RtlInsertElementGenericTable(ptr ptr long ptr) @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) +# RtlInsertElementGenericTableFull +;@ stdcall RtlInsertElementGenericTableFullAvl(ptr ptr long ptr ptr long) @ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) @ stdcall RtlInt64ToUnicodeString(double long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @@ -690,8 +719,6 @@ @ stdcall -arch=i386,x86_64 RtlInterlockedFlushSList(ptr) @ stdcall -arch=i386,x86_64 RtlInterlockedPopEntrySList(ptr) @ stdcall -arch=i386,x86_64 RtlInterlockedPushEntrySList(ptr ptr) -@ stdcall RtlInterlockedPushListSList(ptr ptr ptr long) -@ stdcall RtlInvertRangeList(ptr ptr) @ stdcall RtlIpv4AddressToStringA(ptr ptr) @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @@ -715,7 +742,6 @@ @ stdcall RtlIsGenericTableEmpty(ptr) @ stdcall RtlIsGenericTableEmptyAvl(ptr) @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) -@ stdcall RtlIsRangeAvailable(ptr long long long long long long ptr ptr ptr) @ stdcall RtlIsTextUnicode(ptr long ptr) @ stdcall RtlIsThreadWithinLoaderCallout() @ stdcall RtlIsValidHandle(ptr ptr) @@ -740,15 +766,18 @@ @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) @ stdcall RtlLookupElementGenericTableAvl(ptr ptr) +# RtlLookupElementGenericTableFull +# RtlLookupElementGenericTableFullAvl @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(long ptr) ;@ stdcall RtlMapSecurityErrorToNtStatus -@ stdcall RtlMergeRangeLists(ptr ptr ptr long) @ stdcall RtlMoveMemory(ptr ptr long) @ stdcall RtlMultiAppendUnicodeStringBuffer(ptr long ptr) @ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) @ stdcall RtlMultiByteToUnicodeSize(ptr str long) +# RtlMultipleAllocateHeap +# RtlMultipleFreeHeap @ stdcall RtlNewInstanceSecurityObject(long long ptr ptr ptr ptr ptr long ptr ptr) @ stdcall RtlNewSecurityGrantedAccess(long ptr ptr ptr ptr ptr) @ stdcall RtlNewSecurityObject(ptr ptr ptr long ptr ptr) @@ -771,7 +800,6 @@ ;@ stdcall RtlPopFrame @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) -;@ stdcall RtlPropertySetNameToGuid ; 4.0 only @ stdcall RtlProtectHeap(ptr long) ;@ stdcall RtlPushFrame @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @@ -786,9 +814,6 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) ;@ stdcall RtlQueryProcessHeapInformation ;@ stdcall RtlQueryProcessLockInformation -;@ stdcall RtlQueryProperties ; 4.0 only -;@ stdcall RtlQueryPropertyNames ; 4.0 only -;@ stdcall RtlQueryPropertySet ; 4.0 only @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQuerySecurityObject(ptr long ptr long ptr) @ stdcall RtlQueryTagHeap(ptr long long long ptr) @@ -812,8 +837,6 @@ @ stdcall RtlReleasePrivilege(ptr) @ stdcall RtlReleaseRelativeName(ptr) @ stdcall RtlReleaseResource(ptr) -@ stdcall RtlReleaseSRWLockExclusive(ptr) -@ stdcall RtlReleaseSRWLockShared(ptr) @ stdcall RtlRemoteCall(ptr ptr ptr long ptr long long) @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @@ -847,10 +870,6 @@ @ stdcall RtlSetMemoryStreamSize(ptr int64) @ stdcall RtlSetOwnerSecurityDescriptor(ptr ptr long) @ cdecl RtlSetProcessIsCritical(long ptr long) -;@ stdcall RtlSetProperties ; RtlSetProperties -;@ stdcall RtlSetPropertyClassId ; 4.0 only -;@ stdcall RtlSetPropertyNames ; 4.0 only -;@ stdcall RtlSetPropertySetClassId ; 4.0 only @ stdcall RtlSetSaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr) @@ -865,8 +884,6 @@ @ stdcall RtlSetUserFlagsHeap(ptr long ptr long long) @ stdcall RtlSetUserValueHeap(ptr long ptr ptr) @ stdcall RtlSizeHeap(long long ptr) -@ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) -@ stdcall RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stdcall RtlSplay(ptr) @ stdcall RtlStartRXact(ptr) @ stdcall RtlStatMemoryStream(ptr ptr long) @@ -890,8 +907,6 @@ ;@ stdcall RtlTraceDatabaseUnlock ;@ stdcall RtlTraceDatabaseValidate @ stdcall RtlTryEnterCriticalSection(ptr) -@ fastcall -arch=i386 RtlUlongByteSwap(long) -@ fastcall -ret64 RtlUlonglongByteSwap(double) ;@ stdcall RtlUnhandledExceptionFilter2 @ stdcall RtlUnhandledExceptionFilter(ptr) ;@ stdcall RtlUnicodeStringToAnsiSize(ptr) @@ -922,7 +937,6 @@ @ stdcall RtlUpperChar(long) @ stdcall RtlUpperString(ptr ptr) @ stdcall RtlUsageHeap(ptr long ptr) -@ fastcall -arch=i386 RtlUshortByteSwap(long) @ stdcall RtlValidAcl(ptr) @ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr) @@ -936,8 +950,6 @@ @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) -@ stdcall RtlWakeAllConditionVariable(ptr) -@ stdcall RtlWakeConditionVariable(ptr) @ stdcall RtlWriteMemoryStream(ptr ptr long ptr) @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stdcall RtlZeroHeap(ptr long) @@ -969,6 +981,7 @@ @ stdcall ZwAccessCheckByTypeResultListAndAuditAlarmByHandle(ptr ptr ptr ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeResultListAndAuditAlarmByHandle @ stdcall ZwAddAtom(ptr long ptr) NtAddAtom @ stdcall ZwAddBootEntry(ptr long) +# ZwAddDriverEntry @ stdcall ZwAdjustGroupsToken(long long long long long long) NtAdjustGroupsToken @ stdcall ZwAdjustPrivilegesToken(long long long long long long) NtAdjustPrivilegesToken @ stdcall ZwAlertResumeThread(long ptr) NtAlertResumeThread @@ -977,12 +990,12 @@ @ stdcall ZwAllocateUserPhysicalPages(ptr ptr ptr) @ stdcall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall ZwAllocateVirtualMemory(long ptr ptr ptr long long) NtAllocateVirtualMemory +# ZwApphelpCacheControl @ stdcall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject @ stdcall ZwCallbackReturn(ptr long long) @ stdcall ZwCancelDeviceWakeupRequest(ptr) @ stdcall ZwCancelIoFile(long ptr) NtCancelIoFile -;@ stdcall ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @ stdcall ZwCancelTimer(long ptr) NtCancelTimer @ stdcall ZwClearEvent(long) NtClearEvent @ stdcall ZwClose(long) NtClose @@ -1023,6 +1036,7 @@ @ stdcall ZwDelayExecution(long ptr) NtDelayExecution @ stdcall ZwDeleteAtom(long) NtDeleteAtom @ stdcall ZwDeleteBootEntry(long) NtDeleteBootEntry +# ZwDeleteDriverEntry @ stdcall ZwDeleteFile(ptr) NtDeleteFile @ stdcall ZwDeleteKey(long) NtDeleteKey @ stdcall ZwDeleteObjectAuditAlarm(ptr ptr long) @@ -1032,7 +1046,7 @@ @ stdcall ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject @ stdcall ZwDuplicateToken(long long long long long long) NtDuplicateToken @ stdcall ZwEnumerateBootEntries(ptr ptr) -;@ stdcall ZwEnumerateBus ; 3.51 only +# ZwEnumerateDriverEntries @ stdcall ZwEnumerateKey(long long long ptr long ptr) NtEnumerateKey @ stdcall ZwEnumerateSystemEnvironmentValuesEx(long ptr long) NtEnumerateSystemEnvironmentValuesEx @ stdcall ZwEnumerateValueKey(long long long ptr long ptr) NtEnumerateValueKey @@ -1051,7 +1065,6 @@ @ stdcall ZwGetCurrentProcessorNumber() @ stdcall ZwGetDevicePowerState(ptr ptr) @ stdcall ZwGetPlugPlayEvent(long long ptr long) -@ stdcall ZwGetTickCount() RtlGetTickCount @ stdcall ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall ZwImpersonateAnonymousToken(ptr) @ stdcall ZwImpersonateClientOfPort(ptr ptr) NtImpersonateClientOfPort @@ -1064,6 +1077,7 @@ @ stdcall ZwLoadDriver(ptr) NtLoadDriver @ stdcall ZwLoadKey2(ptr ptr long) NtLoadKey2 @ stdcall ZwLoadKey(ptr ptr) NtLoadKey +# ZwLoadKeyEx @ stdcall ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile @ stdcall ZwLockProductActivationKeys(ptr ptr) NtLockProductActivationKeys @ stdcall ZwLockRegistryKey(ptr) NtLockRegistryKey @@ -1074,6 +1088,7 @@ @ stdcall ZwMapUserPhysicalPagesScatter(ptr ptr ptr) @ stdcall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection @ stdcall ZwModifyBootEntry(ptr) NtModifyBootEntry +# ZwModifyDriverEntry @ stdcall ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey @ stdcall ZwNotifyChangeMultipleKeys(ptr long ptr ptr ptr ptr ptr long long ptr long long) NtNotifyChangeMultipleKeys @@ -1112,6 +1127,7 @@ @ stdcall ZwQueryDefaultUILanguage(ptr) NtQueryDefaultUILanguage @ stdcall ZwQueryDirectoryFile(long long ptr ptr ptr ptr long long long ptr long) NtQueryDirectoryFile @ stdcall ZwQueryDirectoryObject(long ptr long long long ptr ptr) NtQueryDirectoryObject +# ZwQueryDriverEntryOrder @ stdcall ZwQueryEaFile(long ptr ptr long long ptr long ptr long) NtQueryEaFile @ stdcall ZwQueryEvent(long long ptr long ptr) NtQueryEvent @ stdcall ZwQueryFullAttributesFile(ptr ptr) NtQueryFullAttributesFile @@ -1130,6 +1146,7 @@ @ stdcall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall ZwQueryObject(long long long long long) NtQueryObject @ stdcall ZwQueryOpenSubKeys(ptr ptr) NtQueryOpenSubKeys +# ZwQueryOpenSubKeysEx @ stdcall ZwQueryPerformanceCounter (long long) NtQueryPerformanceCounter @ stdcall ZwQueryPortInformationProcess() NtQueryPortInformationProcess @ stdcall ZwQueryQuotaInformationFile(ptr ptr ptr long long ptr long ptr long) NtQueryQuotaInformationFile @@ -1153,11 +1170,9 @@ @ stdcall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter @ stdcall ZwReadRequestData(ptr ptr long ptr long ptr) NtReadRequestData @ stdcall ZwReadVirtualMemory(long ptr ptr long ptr) NtReadVirtualMemory -;@ stdcall ZwRegisterNewDevice ; 3.51 only @ stdcall ZwRegisterThreadTerminatePort(ptr) NtRegisterThreadTerminatePort @ stdcall ZwReleaseKeyedEvent(ptr ptr long ptr) NtReleaseKeyedEvent @ stdcall ZwReleaseMutant(long ptr) NtReleaseMutant -;@ stdcall ZwReleaseProcessMutant ; 3.51 only @ stdcall ZwReleaseSemaphore(long long ptr) NtReleaseSemaphore @ stdcall ZwRemoveIoCompletion(ptr ptr ptr ptr ptr) NtRemoveIoCompletion @ stdcall ZwRemoveProcessDebug(ptr ptr) NtRemoveProcessDebug @@ -1187,12 +1202,12 @@ @ stdcall ZwSetDefaultHardErrorPort(ptr) @ stdcall ZwSetDefaultLocale(long long) @ stdcall ZwSetDefaultUILanguage(long) +# ZwSetDriverEntryOrder @ stdcall ZwSetEaFile(long ptr ptr long) @ stdcall ZwSetEvent(long long) @ stdcall ZwSetEventBoostPriority(ptr) @ stdcall ZwSetHighEventPair(ptr) @ stdcall ZwSetHighWaitLowEventPair(ptr) -;@ stdcall ZwSetHighWaitLowThread ; 3.51 and 4.0 only @ stdcall ZwSetInformationDebugObject(ptr long ptr long ptr) @ stdcall ZwSetInformationFile(long long long long long) @ stdcall ZwSetInformationJobObject(long long ptr long) @@ -1206,7 +1221,6 @@ @ stdcall ZwSetLdtEntries(long double long double) ; CHECKME @ stdcall ZwSetLowEventPair(ptr) @ stdcall ZwSetLowWaitHighEventPair(ptr) -;@ stdcall ZwSetLowWaitHighThread ; 3.51 and 4.0 only @ stdcall ZwSetQuotaInformationFile(ptr ptr ptr long) @ stdcall ZwSetSecurityObject(long long ptr) @ stdcall ZwSetSystemEnvironmentValue(ptr ptr) @@ -1234,17 +1248,17 @@ @ stdcall ZwTraceEvent(long long long ptr) @ stdcall ZwTranslateFilePath(ptr long ptr long) @ stdcall ZwUnloadDriver(ptr) +# ZwUnloadKey2 @ stdcall ZwUnloadKey(long) @ stdcall ZwUnloadKeyEx(ptr ptr) @ stdcall ZwUnlockFile(long ptr ptr ptr ptr) @ stdcall ZwUnlockVirtualMemory(long ptr ptr long) @ stdcall ZwUnmapViewOfSection(long ptr) @ stdcall ZwVdmControl(long ptr) -;@ stdcall ZwW32Call(long ptr long ptr ptr) @ stdcall ZwWaitForDebugEvent(ptr long ptr ptr) @ stdcall ZwWaitForKeyedEvent(ptr ptr long ptr) +# ZwWaitForMultipleObjects32 @ stdcall ZwWaitForMultipleObjects(long ptr long long ptr) -;@ stdcall ZwWaitForProcessMutant ; 3.51 only @ stdcall ZwWaitForSingleObject(long long long) @ stdcall ZwWaitHighEventPair(ptr) @ stdcall ZwWaitLowEventPair(ptr) @@ -1310,6 +1324,7 @@ @ cdecl _wcsicmp(wstr wstr) @ cdecl _wcslwr(wstr) @ cdecl _wcsnicmp(wstr wstr long) +# _wcstoui64 @ cdecl _wcsupr(wstr) @ cdecl _wtoi(wstr) @ cdecl _wtoi64(wstr) @@ -1392,7 +1407,6 @@ @ cdecl wcsrchr(wstr long) @ cdecl wcsspn(wstr wstr) @ cdecl wcsstr(wstr wstr) -;@ cdecl wcstok(wstr wstr) @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) @ cdecl wcstoul(wstr ptr long)

1 0

[khornicek] 63475: [GDI32] - return the correct flags in DdGetDriverInfo CORE-7070
by khornicek＠svn.reactos.org 26 May '14

26 May '14

Author: khornicek Date: Mon May 26 18:59:56 2014 New Revision: 63475 URL: http://svn.reactos.org/svn/reactos?rev=63475&view=rev Log: [GDI32] - return the correct flags in DdGetDriverInfo CORE-7070 Modified: trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c Modified: trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/gdi… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/gdientry.c [iso-8859-1] Mon May 26 18:59:56 2014 @@ -1029,7 +1029,7 @@ pData->dwFlags = pDrvInfoData.dwFlags; pUserColorControl->dwSize = DDCOLORCONTROLCALLBACKSSIZE; - pUserColorControl->dwFlags = pUserColorControl->dwFlags; + pUserColorControl->dwFlags = pColorControl.dwFlags; if (pColorControl.ColorControl != NULL) {

1 0

[akhaldi] 63474: [MSVCRT] * Zap some exports that do not exist in native. * Reorder some exports. CORE-8174
by akhaldi＠svn.reactos.org 26 May '14

26 May '14

Author: akhaldi Date: Mon May 26 18:18:51 2014 New Revision: 63474 URL: http://svn.reactos.org/svn/reactos?rev=63474&view=rev Log: [MSVCRT] * Zap some exports that do not exist in native. * Reorder some exports. CORE-8174 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Mon May 26 18:18:51 2014 @@ -1,6 +1,5 @@ # msvcrt.dll - MS VC++ Run Time Library -@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT @ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_copy_ctor @ cdecl -arch=win64 -norelay ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor @ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) __thiscall_MSVCRT___non_rtti_object_ctor @@ -95,6 +94,7 @@ @ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected @ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception @ cdecl -arch=x86_64 -stub -norelay ?what@exception@@UEBAPEBDXZ() __thiscall_MSVCRT_what_exception +@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -127,7 +127,6 @@ # stub __CxxExceptionFilter @ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler -@ cdecl -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -i386 __CxxLongjmpUnwind(ptr) @ cdecl -i386 __CxxQueryExceptionSize() # stub -i386 __CxxRegisterExceptionObject @@ -152,11 +151,9 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long str long long long) @ cdecl __crtLCMapStringW(long long wstr long wstr long long long) -@ cdecl __daylight() __p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() @ cdecl __fpecode() -@ cdecl __get_app_type() @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv @ cdecl __iob_func() @@ -276,7 +273,6 @@ @ varargs _cwprintf(wstr) # @ varargs _cwscanf(wstr) @ extern _daylight -@ cdecl _difftime64(long long) @ extern _dstbias @ cdecl _dup(long) @ cdecl _dup2(long long) @@ -288,7 +284,6 @@ @ cdecl _errno() @ cdecl -i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -325,17 +320,13 @@ @ cdecl _fpreset() @ cdecl _fputchar(long) @ cdecl _fputwchar(long) -@ cdecl _fseeki64(ptr long long long) @ cdecl _fsopen(str str long) @ cdecl _fstat(long ptr) @ cdecl _fstat64(long ptr) @ cdecl _fstati64(long ptr) -@ cdecl -ret64 _ftelli64(ptr) @ cdecl _ftime(ptr) @ cdecl _ftime64(ptr) @ cdecl -arch=i386 -ret64 _ftol() -@ cdecl -arch=i386 -ret64 _ftol2() _ftol -@ cdecl -arch=i386 -ret64 _ftol2_sse() _ftol #FIXME: SSE variant should be implemented @ cdecl _fullpath(ptr str long) @ cdecl _futime(long ptr) @ cdecl _futime64(long ptr) @@ -371,7 +362,6 @@ @ cdecl _i64toa(long long ptr long) @ cdecl _i64tow(long long ptr long) @ cdecl _initterm(ptr ptr) -@ cdecl _initterm_e(ptr ptr) @ cdecl -arch=i386 _inp(long) MSVCRT__inp @ cdecl -arch=i386 _inpd(long) MSVCRT__inpd @ cdecl -arch=i386 _inpw(long) MSVCRT__inpw @@ -417,7 +407,6 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _loaddll(str) @ cdecl -i386 _local_unwind2(ptr long) -@ cdecl -i386 _local_unwind4(ptr ptr long) @ cdecl _localtime64(ptr) @ cdecl _lock(long) @ cdecl _locking(long long long) @@ -531,7 +520,6 @@ # stub _scprintf # stub _scwprintf @ cdecl _searchenv(str str ptr) -@ stdcall -i386 _seh_longjmp_unwind4(ptr) @ stdcall -i386 _seh_longjmp_unwind(ptr) # stub _set_SSE2_enable @ cdecl _set_error_mode(long) @@ -799,7 +787,6 @@ @ cdecl -i386 longjmp(ptr long) @ cdecl malloc(long) @ cdecl mblen(ptr long) -@ cdecl mbrlen(ptr long ptr) @ cdecl mbstowcs(ptr str long) @ cdecl mbtowc(wstr str long) @ cdecl memchr(ptr long long) @@ -851,7 +838,6 @@ @ cdecl strncat(str str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) -@ cdecl strnlen(str long) @ cdecl strpbrk(str str) @ cdecl strrchr(str long) @ cdecl strspn(str str) @@ -892,7 +878,6 @@ @ cdecl wcsncat(wstr wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) -@ cdecl wcsnlen(wstr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) @ cdecl wcsspn(wstr wstr) @@ -908,8 +893,7 @@ @ varargs wscanf(wstr) # Functions not exported in native dll: -@ cdecl _get_invalid_parameter_handler() -@ cdecl _set_invalid_parameter_handler(ptr) +@ cdecl -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler # Gecko @ cdecl _controlfp_s(ptr long long) @ varargs _snwprintf_s(ptr long long ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs