Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[hbelusca] 58920: Code reorganization only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 4 14:04:35 2013 New Revision: 58920 URL: http://svn.reactos.org/svn/reactos?rev=58920&view=rev Log: Code reorganization only. Modified: trunk/reactos/dll/ntdll/csr/connect.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Sat May 4 14:04:35 2013 @@ -29,145 +29,6 @@ #define UNICODE_PATH_SEP L"\\" /* FUNCTIONS ******************************************************************/ - -/* - * @implemented - */ -HANDLE -NTAPI -CsrGetProcessId(VOID) -{ - return CsrProcessId; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, - IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - IN CSR_API_NUMBER ApiNumber, - IN ULONG DataLength) -{ - NTSTATUS Status; - ULONG PointerCount; - PULONG_PTR OffsetPointer; - - /* Fill out the Port Message Header */ - ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.TotalLength = - FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - ApiMessage->Header.u1.s1.DataLength = - ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - - /* Fill out the CSR Header */ - ApiMessage->ApiNumber = ApiNumber; - ApiMessage->CsrCaptureData = NULL; - - DPRINT("API: %lx, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", - ApiNumber, - ApiMessage->Header.u1.s1.DataLength, - ApiMessage->Header.u1.s1.TotalLength); - - /* Check if we are already inside a CSR Server */ - if (!InsideCsrProcess) - { - /* Check if we got a Capture Buffer */ - if (CaptureBuffer) - { - /* - * We have to convert from our local (client) view - * to the remote (server) view. - */ - ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) - ((ULONG_PTR)CaptureBuffer + CsrPortMemoryDelta); - - /* Lock the buffer. */ - CaptureBuffer->BufferEnd = NULL; - - /* - * Each client pointer inside the CSR message is converted into - * a server pointer, and each pointer to these message pointers - * is converted into an offset. - */ - PointerCount = CaptureBuffer->PointerCount; - OffsetPointer = CaptureBuffer->PointerOffsetsArray; - while (PointerCount--) - { - if (*OffsetPointer != 0) - { - *(PULONG_PTR)*OffsetPointer += CsrPortMemoryDelta; - *OffsetPointer -= (ULONG_PTR)ApiMessage; - } - ++OffsetPointer; - } - } - - /* Send the LPC Message */ - Status = NtRequestWaitReplyPort(CsrApiPort, - &ApiMessage->Header, - &ApiMessage->Header); - - /* Check if we got a Capture Buffer */ - if (CaptureBuffer) - { - /* - * We have to convert back from the remote (server) view - * to our local (client) view. - */ - ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) - ((ULONG_PTR)ApiMessage->CsrCaptureData - CsrPortMemoryDelta); - - /* - * Convert back the offsets into pointers to CSR message - * pointers, and convert back these message server pointers - * into client pointers. - */ - PointerCount = CaptureBuffer->PointerCount; - OffsetPointer = CaptureBuffer->PointerOffsetsArray; - while (PointerCount--) - { - if (*OffsetPointer != 0) - { - *OffsetPointer += (ULONG_PTR)ApiMessage; - *(PULONG_PTR)*OffsetPointer -= CsrPortMemoryDelta; - } - ++OffsetPointer; - } - } - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* We failed. Overwrite the return value with the failure. */ - DPRINT1("LPC Failed: %lx\n", Status); - ApiMessage->Status = Status; - } - } - else - { - /* This is a server-to-server call. Save our CID and do a direct call. */ - DPRINT1("Next gen server-to-server call\n"); - - /* We check this equality inside CsrValidateMessageBuffer */ - ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; - - Status = CsrServerApiRoutine(&ApiMessage->Header, - &ApiMessage->Header); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* We failed. Overwrite the return value with the failure. */ - ApiMessage->Status = Status; - } - } - - /* Return the CSR Result */ - DPRINT("Got back: 0x%lx\n", ApiMessage->Status); - return ApiMessage->Status; -} NTSTATUS NTAPI @@ -460,4 +321,143 @@ return Status; } +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, + IN CSR_API_NUMBER ApiNumber, + IN ULONG DataLength) +{ + NTSTATUS Status; + ULONG PointerCount; + PULONG_PTR OffsetPointer; + + /* Fill out the Port Message Header */ + ApiMessage->Header.u2.ZeroInit = 0; + ApiMessage->Header.u1.s1.TotalLength = + FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + ApiMessage->Header.u1.s1.DataLength = + ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); + + /* Fill out the CSR Header */ + ApiMessage->ApiNumber = ApiNumber; + ApiMessage->CsrCaptureData = NULL; + + DPRINT("API: %lx, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", + ApiNumber, + ApiMessage->Header.u1.s1.DataLength, + ApiMessage->Header.u1.s1.TotalLength); + + /* Check if we are already inside a CSR Server */ + if (!InsideCsrProcess) + { + /* Check if we got a Capture Buffer */ + if (CaptureBuffer) + { + /* + * We have to convert from our local (client) view + * to the remote (server) view. + */ + ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) + ((ULONG_PTR)CaptureBuffer + CsrPortMemoryDelta); + + /* Lock the buffer. */ + CaptureBuffer->BufferEnd = NULL; + + /* + * Each client pointer inside the CSR message is converted into + * a server pointer, and each pointer to these message pointers + * is converted into an offset. + */ + PointerCount = CaptureBuffer->PointerCount; + OffsetPointer = CaptureBuffer->PointerOffsetsArray; + while (PointerCount--) + { + if (*OffsetPointer != 0) + { + *(PULONG_PTR)*OffsetPointer += CsrPortMemoryDelta; + *OffsetPointer -= (ULONG_PTR)ApiMessage; + } + ++OffsetPointer; + } + } + + /* Send the LPC Message */ + Status = NtRequestWaitReplyPort(CsrApiPort, + &ApiMessage->Header, + &ApiMessage->Header); + + /* Check if we got a Capture Buffer */ + if (CaptureBuffer) + { + /* + * We have to convert back from the remote (server) view + * to our local (client) view. + */ + ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) + ((ULONG_PTR)ApiMessage->CsrCaptureData - CsrPortMemoryDelta); + + /* + * Convert back the offsets into pointers to CSR message + * pointers, and convert back these message server pointers + * into client pointers. + */ + PointerCount = CaptureBuffer->PointerCount; + OffsetPointer = CaptureBuffer->PointerOffsetsArray; + while (PointerCount--) + { + if (*OffsetPointer != 0) + { + *OffsetPointer += (ULONG_PTR)ApiMessage; + *(PULONG_PTR)*OffsetPointer -= CsrPortMemoryDelta; + } + ++OffsetPointer; + } + } + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed. Overwrite the return value with the failure. */ + DPRINT1("LPC Failed: %lx\n", Status); + ApiMessage->Status = Status; + } + } + else + { + /* This is a server-to-server call. Save our CID and do a direct call. */ + DPRINT1("Next gen server-to-server call\n"); + + /* We check this equality inside CsrValidateMessageBuffer */ + ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; + + Status = CsrServerApiRoutine(&ApiMessage->Header, + &ApiMessage->Header); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed. Overwrite the return value with the failure. */ + ApiMessage->Status = Status; + } + } + + /* Return the CSR Result */ + DPRINT("Got back: 0x%lx\n", ApiMessage->Status); + return ApiMessage->Status; +} + +/* + * @implemented + */ +HANDLE +NTAPI +CsrGetProcessId(VOID) +{ + return CsrProcessId; +} + /* EOF */

11 years, 7 months

[pschweitzer] 58919: [KERNEL32] Parameters of RtlAcquirePrivilege are not booleans

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 4 09:23:52 2013 New Revision: 58919 URL: http://svn.reactos.org/svn/reactos?rev=58919&view=rev Log: [KERNEL32] Parameters of RtlAcquirePrivilege are not booleans Modified: trunk/reactos/dll/win32/kernel32/client/job.c trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sat May 4 09:23:52 2013 @@ -291,7 +291,7 @@ if (LocalInfo.BasicLimitInformation.LimitFlags & JOB_OBJECT_LIMIT_WORKINGSET) { - Status = RtlAcquirePrivilege(&Privilege, TRUE, FALSE, &State); + Status = RtlAcquirePrivilege(&Privilege, 1, 0, &State); } } Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sat May 4 09:23:52 2013 @@ -627,7 +627,7 @@ PVOID State; NTSTATUS Status; - Status = RtlAcquirePrivilege(&Privilege, TRUE, FALSE, &State); + Status = RtlAcquirePrivilege(&Privilege, 1, 0, &State); if (!NT_SUCCESS(Status)) return NULL; if (Keep)

11 years, 7 months

[tfaber] 58918: [ATL] - Simplify CComObject code. Fix warnings. Patch by Katayama Hirofumi MZ. CORE-7105 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 4 08:39:05 2013 New Revision: 58918 URL: http://svn.reactos.org/svn/reactos?rev=58918&view=rev Log: [ATL] - Simplify CComObject code. Fix warnings. Patch by Katayama Hirofumi MZ. CORE-7105 #resolve Modified: trunk/reactos/lib/atl/atlcom.h trunk/reactos/lib/atl/statreg.h Modified: trunk/reactos/lib/atl/atlcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcom.h?rev=58918… ============================================================================== --- trunk/reactos/lib/atl/atlcom.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcom.h [iso-8859-1] Sat May 4 08:39:05 2013 @@ -2,6 +2,7 @@ * ReactOS ATL * * Copyright 2009 Andrew Hill <ash77(a)reactos.org> + * Copyright 2013 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -134,39 +135,28 @@ virtual ~CComObject() { - CComObject<Base> *pThis; - - pThis = reinterpret_cast<CComObject<Base> *>(this); - pThis->FinalRelease(); + this->FinalRelease(); _pAtlModule->Unlock(); } STDMETHOD_(ULONG, AddRef)() { - CComObject<Base> *pThis; - - pThis = reinterpret_cast<CComObject<Base> *>(this); - return pThis->InternalAddRef(); + return this->InternalAddRef(); } STDMETHOD_(ULONG, Release)() { - CComObject<Base> *pThis; - ULONG l; - - pThis = reinterpret_cast<CComObject<Base> *>(this); - l = pThis->InternalRelease(); - if (l == 0) + ULONG newRefCount; + + newRefCount = this->InternalRelease(); + if (newRefCount == 0) delete this; - return l; + return newRefCount; } STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) { - CComObject<Base> *pThis; - - pThis = reinterpret_cast<CComObject<Base> *>(this); - return pThis->_InternalQueryInterface(iid, ppvObject); + return this->_InternalQueryInterface(iid, ppvObject); } static HRESULT WINAPI CreateInstance(CComObject<Base> **pp) @@ -283,11 +273,9 @@ STDMETHOD_(ULONG, AddRef)() { - CComObjectCached<Base> *pThis; ULONG newRefCount; - pThis = reinterpret_cast<CComObjectCached<Base>*>(this); - newRefCount = pThis->InternalAddRef(); + newRefCount = this->InternalAddRef(); if (newRefCount == 2) _pAtlModule->Lock(); return newRefCount; @@ -295,11 +283,9 @@ STDMETHOD_(ULONG, Release)() { - CComObjectCached<Base> *pThis; ULONG newRefCount; - pThis = reinterpret_cast<CComObjectCached<Base>*>(this); - newRefCount = pThis->InternalRelease(); + newRefCount = this->InternalRelease(); if (newRefCount == 0) delete this; else if (newRefCount == 1) @@ -309,10 +295,7 @@ STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) { - CComObjectCached<Base> *pThis; - - pThis = reinterpret_cast<CComObjectCached<Base>*>(this); - return pThis->_InternalQueryInterface(iid, ppvObject); + return this->_InternalQueryInterface(iid, ppvObject); } }; @@ -436,6 +419,11 @@ { public: _ATL_CREATORFUNC *m_pfnCreateInstance; + + virtual ~CComClassFactory() + { + } + public: STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, void **ppvObj) { Modified: trunk/reactos/lib/atl/statreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/statreg.h?rev=5891… ============================================================================== --- trunk/reactos/lib/atl/statreg.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/statreg.h [iso-8859-1] Sat May 4 08:39:05 2013 @@ -63,6 +63,7 @@ hResult = ClearReplacements(); ATLASSERT(SUCCEEDED(hResult)); + (void)hResult; } HRESULT STDMETHODCALLTYPE QueryInterface(const IID & /* riid */, void ** /* ppvObject */ )

11 years, 7 months

[tfaber] 58917: [WININET_WINETEST] - Hackfix hanging test. There's no benefit in having testbot take longer. ROSTESTS-73 #comment Temporary timeout added in r58917 to prevent hanging.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 4 08:10:58 2013 New Revision: 58917 URL: http://svn.reactos.org/svn/reactos?rev=58917&view=rev Log: [WININET_WINETEST] - Hackfix hanging test. There's no benefit in having testbot take longer. ROSTESTS-73 #comment Temporary timeout added in r58917 to prevent hanging. Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Sat May 4 08:10:58 2013 @@ -2269,7 +2269,11 @@ SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); +#ifdef ROSTESTS_73_FIXED WaitForSingleObject(hCompleteEvent, INFINITE); +#else /* ROSTESTS_73_FIXED */ + ok(WaitForSingleObject(hCompleteEvent, 5000) == WAIT_OBJECT_0, "Wait timed out\n"); +#endif /* ROSTESTS_73_FIXED */ ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED);

11 years, 7 months

[pschweitzer] 58916: [NTOSKRNL] Prevent potential double free in loop. Fixes CID 732510

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 3 19:31:03 2013 New Revision: 58916 URL: http://svn.reactos.org/svn/reactos?rev=58916&view=rev Log: [NTOSKRNL] Prevent potential double free in loop. Fixes CID 732510 Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Fri May 3 19:31:03 2013 @@ -367,7 +367,11 @@ DeviceNameLength += sizeof(WCHAR); /* Free the buffer if we had one */ - if (PoolObjectNameInfo) ExFreePool(PoolObjectNameInfo); + if (PoolObjectNameInfo) + { + ExFreePool(PoolObjectNameInfo); + PoolObjectNameInfo = NULL; + } /* Go to the next string buffer position */ ErrorMessage->EntryData.NumberOfStrings++; @@ -428,7 +432,7 @@ break; } - /* Derefernece the device object */ + /* Dereference the device object */ if (LogEntry->DeviceObject) ObDereferenceObject(LogEntry->DeviceObject); if (DriverObject) ObDereferenceObject(LogEntry->DriverObject);

11 years, 7 months

[jgardou] 58915: [PSDK] * Add complete definition of KEY_INFORMATION_CLASS [DDK] * Add KEY_NAME_INFORMATION structure declaration

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri May 3 18:28:34 2013 New Revision: 58915 URL: http://svn.reactos.org/svn/reactos?rev=58915&view=rev Log: [PSDK] * Add complete definition of KEY_INFORMATION_CLASS [DDK] * Add KEY_NAME_INFORMATION structure declaration Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=58… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Fri May 3 18:28:34 2013 @@ -5836,6 +5836,33 @@ _In_ NTSTATUS Status); #endif +/* Output parameters of ZwQueryKey */ + +typedef struct _KEY_NAME_INFORMATION { + ULONG NameLength; + WCHAR Name[1]; +} KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION; + +typedef struct _KEY_CACHED_INFORMATION { + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG SubKeys; + ULONG MaxNameLen; + ULONG Values; + ULONG MaxValueNameLen; + ULONG MaxValueDataLen; + ULONG NameLength; +} KEY_CACHED_INFORMATION, *PKEY_CACHED_INFORMATION; + +typedef struct _KEY_VIRTUALIZATION_INFORMATION { + ULONG VirtualizationCandidate :1; + ULONG VirtualizationEnabled :1; + ULONG VirtualTarget :1; + ULONG VirtualStore :1; + ULONG VirtualSource :1; + ULONG Reserved :27; +} KEY_VIRTUALIZATION_INFORMATION, *PKEY_VIRTUALIZATION_INFORMATION; + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Fri May 3 18:28:34 2013 @@ -632,10 +632,16 @@ FileFsMaximumInformation } FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; -typedef enum _KEY_INFORMATION_CLASS { - KeyBasicInformation, - KeyNodeInformation, - KeyFullInformation +typedef enum _KEY_INFORMATION_CLASS { + KeyBasicInformation = 0, + KeyNodeInformation = 1, + KeyFullInformation = 2, + KeyNameInformation = 3, + KeyCachedInformation = 4, + KeyFlagsInformation = 5, + KeyVirtualizationInformation = 6, + KeyHandleTagsInformation = 7, + MaxKeyInfoClass = 8 } KEY_INFORMATION_CLASS; typedef enum _KEY_VALUE_INFORMATION_CLASS {

11 years, 7 months

[jgardou] 58914: [ADVAPI32] - SEH-ize access to the data buffer in RegSetValueExW. Fixes winetest crash

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri May 3 16:44:31 2013 New Revision: 58914 URL: http://svn.reactos.org/svn/reactos?rev=58914&view=rev Log: [ADVAPI32] - SEH-ize access to the data buffer in RegSetValueExW. Fixes winetest crash Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Fri May 3 16:44:31 2013 @@ -14,6 +14,7 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> +#include <pseh/pseh2.h> WINE_DEFAULT_DEBUG_CHANNEL(reg); /* DEFINES ******************************************************************/ @@ -4952,10 +4953,29 @@ DWORD cbData) { UNICODE_STRING ValueName; - PUNICODE_STRING pValueName; HANDLE KeyHandle; NTSTATUS Status; + if (is_string(dwType) && (cbData != 0)) + { + PWSTR pwsData = (PWSTR)lpData; + + _SEH2_TRY + { + if((pwsData[cbData / sizeof(WCHAR) - 1] != L'\0') && + (pwsData[cbData / sizeof(WCHAR)] == L'\0')) + { + /* Increment length if last character is not zero and next is zero */ + cbData += sizeof(WCHAR); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return ERROR_NOACCESS); + } + _SEH2_END; + } + Status = MapDefaultKey(&KeyHandle, hKey); if (!NT_SUCCESS(Status)) @@ -4964,22 +4984,9 @@ } RtlInitUnicodeString(&ValueName, lpValueName); - pValueName = &ValueName; - - if (is_string(dwType) && (cbData != 0)) - { - PWSTR pwsData = (PWSTR)lpData; - - if((pwsData[cbData / sizeof(WCHAR) - 1] != L'\0') && - (pwsData[cbData / sizeof(WCHAR)] == L'\0')) - { - /* Increment length if last character is not zero and next is zero */ - cbData += sizeof(WCHAR); - } - } Status = NtSetValueKey(KeyHandle, - pValueName, + &ValueName, 0, dwType, (PVOID)lpData,

11 years, 7 months

[akhaldi] 58913: [WIN32SS] * Plug a leak in IntGdiAddFontResource(). Original fix by Katayama Hirofumi MZ with one more instance covered by Timo Kreuzer. * Return 0 instead of status in the file ma...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 3 09:57:19 2013 New Revision: 58913 URL: http://svn.reactos.org/svn/reactos?rev=58913&view=rev Log: [WIN32SS] * Plug a leak in IntGdiAddFontResource(). Original fix by Katayama Hirofumi MZ with one more instance covered by Timo Kreuzer. * Return 0 instead of status in the file mapping failure path. By Timo Kreuzer. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri May 3 09:57:19 2013 @@ -346,7 +346,8 @@ if (!NT_SUCCESS(Status)) { DPRINT("Could not map file: %wZ\n", FileName); - return Status; + ObDereferenceObject(SectionObject); + return 0; } IntLockFreeType; @@ -357,6 +358,7 @@ 0, &Face); IntUnLockFreeType; + ObDereferenceObject(SectionObject); if (Error) { @@ -364,7 +366,6 @@ DPRINT("Unknown font file format\n"); else DPRINT("Error reading font file (error code: %u)\n", Error); - ObDereferenceObject(SectionObject); return 0; } @@ -372,7 +373,6 @@ if (!Entry) { FT_Done_Face(Face); - ObDereferenceObject(SectionObject); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } @@ -381,7 +381,6 @@ if (FontGDI == NULL) { FT_Done_Face(Face); - ObDereferenceObject(SectionObject); ExFreePoolWithTag(Entry, TAG_FONT); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -392,7 +391,6 @@ { EngFreeMem(FontGDI); FT_Done_Face(Face); - ObDereferenceObject(SectionObject); ExFreePoolWithTag(Entry, TAG_FONT); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0;

11 years, 7 months

[akhaldi] 58912: [CRT] * Annotate tchar.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 2 17:09:34 2013 New Revision: 58912 URL: http://svn.reactos.org/svn/reactos?rev=58912&view=rev Log: [CRT] * Annotate tchar.h. Modified: trunk/reactos/include/crt/tchar.h Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/tchar.h [iso-8859-1] Thu May 2 17:09:34 2013 @@ -855,65 +855,489 @@ #else /* !_MB_MAP_DIRECT */ - _CRTIMP _CONST_RETURN char *__cdecl _tcschr(const char *_Str,unsigned int _Val); - _CRTIMP size_t __cdecl _tcscspn(const char *_Str,const char *_Control); - _CRTIMP char *__cdecl _tcsncat(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsncat_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsncpy(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsncpy_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP _CONST_RETURN char *__cdecl _tcspbrk(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl _tcsrchr(const char *_Str,unsigned int _Ch); - _CRTIMP size_t __cdecl _tcsspn(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl _tcsstr(const char *_Str,const char *_Substr); - _CRTIMP char *__cdecl _tcstok(char *_Str,const char *_Delim); - _CRTIMP char *__cdecl _tcstok_l(char *_Str,const char *_Delim,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsnset(char *_Str,unsigned int _Val,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsrev(char *_Str); - _CRTIMP char *__cdecl _tcsset(char *_Str,unsigned int _Val); - _CRTIMP char *__cdecl _tcsset_l(char *_Str,unsigned int _Val,_locale_t _Locale); - _CRTIMP int __cdecl _tcscmp(const char *_Str1,const char *_Str); - _CRTIMP int __cdecl _tcsicmp(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _tcsicmp_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnccmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsnicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcscoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _tcscoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _tcsicoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _tcsicoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnccoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsnccoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsncoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsncicoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnicoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsnicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP size_t __cdecl _tcsclen(const char *_Str); - _CRTIMP size_t __cdecl _tcscnlen(const char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _tcsclen_l(const char *_Str,_locale_t _Locale); - _CRTIMP size_t __cdecl _tcscnlen_l(const char *_Str,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsnccat(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsnccat_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsnccpy(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsnccpy_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsncset(char *_Str,unsigned int _Val,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsdec(const char *_Start,const char *_Pos); - _CRTIMP char *__cdecl _tcsinc(const char *_Ptr); - _CRTIMP size_t __cdecl _tcsnbcnt(const char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _tcsnccnt(const char *_Str,size_t _MaxCount); - _CRTIMP unsigned int __cdecl _tcsnextc (const char *_Str); - _CRTIMP char *__cdecl _tcsninc(const char *_Ptr,size_t _Count); - _CRTIMP char *__cdecl _tcsspnp(const char *_Str1,const char *_Str2); - _CRTIMP char *__cdecl _tcslwr(char *_Str); - _CRTIMP char *__cdecl _tcslwr_l(char *_Str,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsupr(char *_Str); - _CRTIMP char *__cdecl _tcsupr_l(char *_Str,_locale_t _Locale); - _CRTIMP size_t __cdecl _tclen(const char *_Str); - _CRTIMP void __cdecl _tccpy(char *_DstCh,const char *_SrcCh); + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcschr( + _In_z_ const char *_Str, + _In_ unsigned int _Val); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcscspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _CRTIMP + char* + __cdecl + _tcsncat( + _Inout_updates_z_(_MaxCount) char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsncat_l( + _Inout_updates_z_(_MaxCount) char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsncpy( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsncpy_l( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcspbrk( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcsrchr( + _In_z_ const char *_Str, + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcsspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcsstr( + _In_z_ const char *_Str, + _In_z_ const char *_Substr); + + _Check_return_ + _CRTIMP + char* + __cdecl + _tcstok( + _Inout_opt_ char *_Str, + _In_z_ const char *_Delim); + + _Check_return_ + _CRTIMP + char* + __cdecl + _tcstok_l( + _Inout_opt_ char *_Str, + _In_z_ const char *_Delim, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsnset( + _Inout_z_ char *_Str, + _In_ unsigned int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsrev( + _Inout_z_ char *_Str); + + _CRTIMP + char* + __cdecl + _tcsset( + _Inout_z_ char *_Str, + _In_ unsigned int _Val); + + _CRTIMP + char* + __cdecl + _tcsset_l( + _Inout_z_ char *_Str, + _In_ unsigned int _Val, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcscmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnccmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcscoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcscoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnccoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnccoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcsclen( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcscnlen( + _In_z_ const char *_Str, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcsclen_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcscnlen_l( + _In_z_ const char *_Str, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsnccat( + _Inout_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsnccat_l( + _Inout_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsnccpy( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsnccpy_l( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsncset( + _Inout_updates_z_(_MaxCount) char *_Str, + _In_ unsigned int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsdec( + _In_reads_z_(_Pos-_Start + 1) const char *_Start, + _In_z_ const char *_Pos); + + _CRTIMP + char* + __cdecl + _tcsinc( + _In_z_ const char *_Ptr); + + _CRTIMP + size_t + __cdecl + _tcsnbcnt( + _In_reads_(_MaxCount) _Pre_z_ const char *_Str, + _In_ size_t _MaxCount); + + _CRTIMP + size_t + __cdecl + _tcsnccnt( + _In_reads_(_MaxCount) _Pre_z_ const char *_Str, + _In_ size_t _MaxCount); + + _CRTIMP + unsigned int + __cdecl + _tcsnextc( + _In_z_ const char *_Str); + + _CRTIMP + char* + __cdecl + _tcsninc( + _In_reads_(_Count) _Pre_z_ const char *_Ptr, + _In_ size_t _Count); + + _CRTIMP + char* + __cdecl + _tcsspnp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _CRTIMP + char* + __cdecl + _tcslwr( + _Inout_ char *_Str); + + _CRTIMP + char* + __cdecl + _tcslwr_l( + _Inout_ char *_Str, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsupr( + _Inout_ char *_Str); + + _CRTIMP + char* + __cdecl + _tcsupr_l( + _Inout_ char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tclen( + _In_z_ const char *_Str); + + _CRTIMP + void + __cdecl + _tccpy( + _Pre_notnull_ _Post_z_ char *_DstCh, + _In_z_ const char *_SrcCh); #ifdef __cplusplus #ifndef _CPP_TCHAR_INLINES_DEFINED

11 years, 7 months

[akhaldi] 58911: [CRT] * Annotate memory.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 2 14:21:18 2013 New Revision: 58911 URL: http://svn.reactos.org/svn/reactos?rev=58911&view=rev Log: [CRT] * Annotate memory.h. Modified: trunk/reactos/include/crt/memory.h Modified: trunk/reactos/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/memory.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/memory.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/memory.h [iso-8859-1] Thu May 2 14:21:18 2013 @@ -20,21 +20,103 @@ #ifndef _CRT_MEMORY_DEFINED #define _CRT_MEMORY_DEFINED - _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); - _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); - _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); - int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); - void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); - void *__cdecl memset(void *_Dst,int _Val,size_t _Size); -#ifndef NO_OLDNAMES - _CRTIMP void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); - _CRTIMP int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); -#endif -#endif + _CRTIMP + void* + __cdecl + _memccpy( + _Out_writes_bytes_opt_(_MaxCount) void *_Dst, + _In_ const void *_Src, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Check_return_ + _CONST_RETURN + void* + __cdecl + memchr( + _In_reads_bytes_opt_(_MaxCount) const void *_Buf, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + int + __cdecl + _memicmp_l( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_ + int + __cdecl + memcmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _MaxCount, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) + _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) + void* + __cdecl + memcpy( + _Out_writes_bytes_all_(_MaxCount) void *_Dst, + _In_reads_bytes_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _Size, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == _Val)) + void* + __cdecl + memset( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_ int _Val, + _In_ size_t _Size); + +#ifndef NO_OLDNAMES + + _CRTIMP + void* + __cdecl + memccpy( + _Out_writes_bytes_opt_(_Size) void *_Dst, + _In_reads_bytes_opt_(_Size) const void *_Src, + _In_ int _Val, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + int + __cdecl + memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + +#endif /* NO_OLDNAMES */ + +#endif /* _CRT_MEMORY_DEFINED */ #ifdef __cplusplus } #endif -#endif + +#endif /* _INC_MEMORY */

11 years, 7 months

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 May 2013