Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[fireball] 50544: - Robert Horvath: Modify GetFullPathName to follow Windows behaviour more closely. Reduces kernel32:path winetests by 4, and fixes all GetFullPathName tests. See issue #5865 for m...

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 28 20:22:15 2011 New Revision: 50544 URL: http://svn.reactos.org/svn/reactos?rev=50544&view=rev Log: - Robert Horvath: Modify GetFullPathName to follow Windows behaviour more closely. Reduces kernel32:path winetests by 4, and fixes all GetFullPathName tests. See issue #5865 for more details. Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Fri Jan 28 20:22:15 2011 @@ -599,12 +599,6 @@ TRACE("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); - if (!lpFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) return 0; @@ -661,6 +655,14 @@ TRACE("GetFullPathNameW ret: lpBuffer %S lpFilePart %S Length %ld\n", lpBuffer, (lpFilePart == NULL) ? L"NULL" : *lpFilePart, Length / sizeof(WCHAR)); + + if (!lpFileName) + { +#if (WINVER >= _WIN32_WINNT_WIN7) + SetLastError(ERROR_INVALID_PARAMETER); +#endif + return 0; + } return Length/sizeof(WCHAR); }

13 years, 7 months

[fireball] 50543: - Robert Horvath: Always limit destLen to MAX_PATH (modified to an if condition by me). See issue #5861 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 28 20:18:07 2011 New Revision: 50543 URL: http://svn.reactos.org/svn/reactos?rev=50543&view=rev Log: - Robert Horvath: Always limit destLen to MAX_PATH (modified to an if condition by me). See issue #5861 for more details. Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Fri Jan 28 20:18:07 2011 @@ -71,6 +71,9 @@ ) { DWORD ret; + + /* destLen should never exceed MAX_PATH */ + if (destLen > MAX_PATH) destLen = MAX_PATH; ret = bIsFileApiAnsi? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); /* ret incl. nullchar */

13 years, 7 months

[janderwald] 50542: [KS] - Less spam, more information

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Jan 28 19:45:49 2011 New Revision: 50542 URL: http://svn.reactos.org/svn/reactos?rev=50542&view=rev Log: [KS] - Less spam, more information Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Jan 28 19:45:49 2011 @@ -1643,7 +1643,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); + DPRINT("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); // HACK for ms portcls if (IoStack->MajorFunction == IRP_MJ_CREATE)

13 years, 7 months

[tkreuzer] 50541: [PSDK] Fix inline definition of STRSAFEAPI for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 28 19:41:28 2011 New Revision: 50541 URL: http://svn.reactos.org/svn/reactos?rev=50541&view=rev Log: [PSDK] Fix inline definition of STRSAFEAPI for MSVC Modified: branches/cmake-bringup/include/psdk/strsafe.h Modified: branches/cmake-bringup/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/strs… ============================================================================== --- branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] Fri Jan 28 19:41:28 2011 @@ -239,7 +239,11 @@ #else // !STRSAFE_LIB /* Create inlined versions */ +#ifdef __GNUC__ #define STRSAFEAPI HRESULT static __inline__ +#else +#define STRSAFEAPI HRESULT __inline +#endif #define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH) @@ -497,7 +501,7 @@ if (SUCCEEDED(hr)) { - if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && (iResult + 1 < cchMax)) + if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && ((size_t)iResult + 1 < cchMax)) { memset(pszDest + iResult + 1, dwFlags & 0xff,

13 years, 7 months

[tkreuzer] 50540: [CMAKE] Set linker language for win32ksys to C. Fixes MSVC compilation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 28 19:37:22 2011 New Revision: 50540 URL: http://svn.reactos.org/svn/reactos?rev=50540&view=rev Log: [CMAKE] Set linker language for win32ksys to C. Fixes MSVC compilation Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/win32ksys/CMa… ============================================================================== --- branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] Fri Jan 28 19:37:22 2011 @@ -2,3 +2,4 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S PROPERTIES GENERATED TRUE) add_library(win32ksys ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) add_dependencies(win32ksys win32k_S asm) +set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE C)

13 years, 7 months

[tkreuzer] 50539: [CMAKE] Remove module name from ntoskrnl add_importlib_target

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 28 18:16:48 2011 New Revision: 50539 URL: http://svn.reactos.org/svn/reactos?rev=50539&view=rev Log: [CMAKE] Remove module name from ntoskrnl add_importlib_target Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Jan 28 18:16:48 2011 @@ -450,4 +450,4 @@ add_minicd_target(ntoskrnl reactos ntoskrnl.exe) add_livecd_target(ntoskrnl reactos/system32) -add_importlib_target(ntoskrnl.spec ntoskrnl.exe) +add_importlib_target(ntoskrnl.spec)

13 years, 7 months

[tkreuzer] 50538: [HID] Fix spec file. All of the functions are present, either stubbed or implemented.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 28 18:13:54 2011 New Revision: 50538 URL: http://svn.reactos.org/svn/reactos?rev=50538&view=rev Log: [HID] Fix spec file. All of the functions are present, either stubbed or implemented. Modified: branches/cmake-bringup/dll/win32/hid/hid.spec Modified: branches/cmake-bringup/dll/win32/hid/hid.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/hid… ============================================================================== --- branches/cmake-bringup/dll/win32/hid/hid.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hid/hid.spec [iso-8859-1] Fri Jan 28 18:13:54 2011 @@ -1,44 +1,44 @@ -@ stub HidD_FlushQueue -@ stub HidD_FreePreparsedData -@ stub HidD_GetAttributes -@ stub HidD_GetConfiguration -@ stub HidD_GetFeature +@ stdcall HidD_FlushQueue(ptr) +@ stdcall HidD_FreePreparsedData(ptr) +@ stdcall HidD_GetAttributes(ptr ptr) +@ stdcall HidD_GetConfiguration(ptr ptr long) +@ stdcall HidD_GetFeature(ptr ptr long) @ stdcall HidD_GetHidGuid(ptr) -@ stub HidD_GetIndexedString -@ stub HidD_GetInputReport -@ stub HidD_GetManufacturerString -@ stub HidD_GetMsGenreDescriptor -@ stub HidD_GetNumInputBuffers -@ stub HidD_GetPhysicalDescriptor -@ stub HidD_GetPreparsedData -@ stub HidD_GetProductString -@ stub HidD_GetSerialNumberString -@ stub HidD_Hello -@ stub HidD_SetConfiguration -@ stub HidD_SetFeature -@ stub HidD_SetNumInputBuffers -@ stub HidD_SetOutputReport -@ stub HidP_GetButtonCaps -@ stub HidP_GetCaps -@ stub HidP_GetData -@ stub HidP_GetExtendedAttributes -@ stub HidP_GetLinkCollectionNodes -@ stub HidP_GetScaledUsageValue -@ stub HidP_GetSpecificButtonCaps -@ stub HidP_GetSpecificValueCaps -@ stub HidP_GetUsageValue -@ stub HidP_GetUsageValueArray -@ stub HidP_GetUsages -@ stub HidP_GetUsagesEx -@ stub HidP_GetValueCaps -@ stub HidP_InitializeReportForID -@ stub HidP_MaxDataListLength -@ stub HidP_MaxUsageListLength -@ stub HidP_SetData -@ stub HidP_SetScaledUsageValue -@ stub HidP_SetUsageValue -@ stub HidP_SetUsageValueArray -@ stub HidP_SetUsages -@ stub HidP_TranslateUsagesToI8042ScanCodes -@ stub HidP_UnsetUsages -@ stub HidP_UsageListDifference +@ stdcall HidD_GetIndexedString(ptr long ptr long) +@ stdcall HidD_GetInputReport(ptr ptr long) +@ stdcall HidD_GetManufacturerString(ptr ptr long) +@ stdcall HidD_GetMsGenreDescriptor(ptr ptr long) +@ stdcall HidD_GetNumInputBuffers(ptr ptr) +@ stdcall HidD_GetPhysicalDescriptor(ptr ptr long) +@ stdcall HidD_GetPreparsedData(ptr ptr) +@ stdcall HidD_GetProductString(ptr ptr long) +@ stdcall HidD_GetSerialNumberString(ptr ptr long) +@ stdcall HidD_Hello(ptr long) +@ stdcall HidD_SetConfiguration(ptr ptr long) +@ stdcall HidD_SetFeature(ptr ptr long) +@ stdcall HidD_SetNumInputBuffers(ptr long) +@ stdcall HidD_SetOutputReport(ptr ptr long) +@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) +@ stdcall HidP_GetCaps(ptr ptr) +@ stdcall HidP_GetData(long ptr ptr ptr ptr long) +@ stdcall HidP_GetExtendedAttributes(long long ptr ptr ptr) +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) +@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetValueCaps(long ptr ptr ptr) +@ stdcall HidP_InitializeReportForID(long long ptr ptr long) +@ stdcall HidP_MaxDataListLength(long ptr) +@ stdcall HidP_MaxUsageListLength(long long ptr) +@ stdcall HidP_SetData(long ptr ptr ptr ptr long) +@ stdcall HidP_SetScaledUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) +@ stdcall HidP_UnsetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_UsageListDifference(ptr ptr ptr ptr long)

13 years, 7 months

[tkreuzer] 50537: [CRT] add a single prototype, instead of including math.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 28 17:44:30 2011 New Revision: 50537 URL: http://svn.reactos.org/svn/reactos?rev=50537&view=rev Log: [CRT] add a single prototype, instead of including math.h Modified: branches/cmake-bringup/lib/sdk/crt/math/powf.c Modified: branches/cmake-bringup/lib/sdk/crt/math/powf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/powf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/powf.c [iso-8859-1] Fri Jan 28 17:44:30 2011 @@ -3,7 +3,8 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include <math.h> + +double __cdecl pow(double x, double y); float powf(float x, float y) {

13 years, 7 months

[tkreuzer] 50536: [CMAKE] - Preserve case of symbols when assembling (this is not default) - link to msvcsup

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 28 17:40:36 2011 New Revision: 50536 URL: http://svn.reactos.org/svn/reactos?rev=50536&view=rev Log: [CMAKE] - Preserve case of symbols when assembling (this is not default) - link to msvcsup Modified: branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=505… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Jan 28 17:40:36 2011 @@ -120,6 +120,7 @@ set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) + target_link_libraries(${MODULE} msvcsup) endif() endmacro() @@ -157,7 +158,7 @@ # Assemble the stub file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj - COMMAND ${CMAKE_ASM_COMPILER} /nologo /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm + COMMAND ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm") # Add neccessary importlibs for redirections Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Fri Jan 28 17:40:36 2011 @@ -17,7 +17,7 @@ SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp") + "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")

13 years, 7 months

[spetreolle] 50535: [CMAKE] Fix crt/bootcdregtest regression, due to _USER32_WSPRINTF. add_definitions does not apply to target, but current directory.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Jan 28 13:41:55 2011 New Revision: 50535 URL: http://svn.reactos.org/svn/reactos?rev=50535&view=rev Log: [CMAKE] Fix crt/bootcdregtest regression, due to _USER32_WSPRINTF. add_definitions does not apply to target, but current directory. Added: branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Jan 28 13:41:55 2011 @@ -626,15 +626,4 @@ add_dependencies(msvcsup psdk buildno_header asm) endif() -add_definitions(-D_USER32_WSPRINTF) -add_library(user32_wsprintf - printf/streamout.c - printf/wstreamout.c - printf/wsprintfA.c - printf/wsprintfW.c - printf/wvsprintfA.c - printf/wvsprintfW.c - printf/wvsnprintfA.c - printf/wvsnprintfW.c - string/mbstowcs_nt.c - string/wcstombs_nt.c) +add_subdirectory(printf) Added: branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/print… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt [iso-8859-1] Fri Jan 28 13:41:55 2011 @@ -1,0 +1,16 @@ + +include_directories(.. ../include) + +add_definitions(-D_USER32_WSPRINTF) + +add_library(user32_wsprintf + streamout.c + wstreamout.c + wsprintfA.c + wsprintfW.c + wvsprintfA.c + wvsprintfW.c + wvsnprintfA.c + wvsnprintfW.c + ../string/mbstowcs_nt.c + ../string/wcstombs_nt.c) Propchange: branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011